aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-23 16:50:10 +0100
committerIngela Anderton Andin <[email protected]>2017-11-23 16:50:10 +0100
commita453532fe31eecd8c39b5035702ee20b402fd687 (patch)
tree68ad1f9247963c5fb049315efeb0cad7fd3aaa13 /OTP_VERSION
parent8a2e432f92f621a8048ea8e92c2801f323c51280 (diff)
parent2302ea8ca97b8a9075e9234d15430c47d3a115c8 (diff)
downloadotp-a453532fe31eecd8c39b5035702ee20b402fd687.tar.gz
otp-a453532fe31eecd8c39b5035702ee20b402fd687.tar.bz2
otp-a453532fe31eecd8c39b5035702ee20b402fd687.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Update release notes Update version numbers public_key: verify ip (both v4 and v6) public_key: Added IP4 address checks to hostname_verification tests ssl: Fix test cases to work on all test platforms public_key: Fix dialyzer spec ssl: Sessions must be registered with SNI if exists ssl: Extend hostname check to fallback to checking IP-address public_key, ssl: Handles keys so that APIs are preserved correctly ssl: Use ?FUNCTION_NAME ssl: Prepare for release ssl: Countermeasurements for Bleichenbacher attack Conflicts: lib/public_key/doc/src/public_key.xml lib/public_key/test/public_key_SUITE.erl lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName_IP.pem lib/public_key/test/public_key_SUITE_data/verify_hostname_ip.conf lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_handshake.erl
Diffstat (limited to 'OTP_VERSION')
-rw-r--r--OTP_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index b85240c18b..bf8f7ca9a2 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-20.1.6
+20.1.7