aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-12-20 13:26:58 +0100
committerErlang/OTP <[email protected]>2018-12-20 13:26:58 +0100
commit26b95bfaf19f7b878412829d638b8abf8be7374d (patch)
tree912ecf1f200188e15ebf231c1f29a53633628909 /lib
parent8f14ceb1d6f1956172eddd116cef1ea1f613af9b (diff)
downloadotp-26b95bfaf19f7b878412829d638b8abf8be7374d.tar.gz
otp-26b95bfaf19f7b878412829d638b8abf8be7374d.tar.bz2
otp-26b95bfaf19f7b878412829d638b8abf8be7374d.zip
Prepare release
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/doc/src/notes.xml21
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 22 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 48372babf8..854ab31883 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,27 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
+<section><title>SSL 9.1.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed renegotiation bug. Client did not handle server
+ initiated renegotiation correctly after rewrite to two
+ connection processes, due to ERL-622 commit
+ d87ac1c55188f5ba5cdf72384125d94d42118c18. This could
+ manifest it self as a " bad_record_mac" alert.</p>
+ <p>
+ Also included are some optimizations</p>
+ <p>
+ Own Id: OTP-15489 Aux Id: ERL-308 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 9.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 75d959accf..3501622f5a 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.1
+SSL_VSN = 9.1.1