diff options
author | Raimo Niskanen <[email protected]> | 2019-04-18 13:55:39 +0200 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2019-04-18 13:55:39 +0200 |
commit | 3694a010d2c5ec63f97405519f4b728eea1f902b (patch) | |
tree | 2878db91c64aa4a90e1eb26e2a53d1d262172001 /lib | |
parent | 4f6115e0027691c508562973398bc76a6f6944fd (diff) | |
parent | 98669a56d4cacf5bf6c7413d264dc50289f84bb9 (diff) | |
download | otp-3694a010d2c5ec63f97405519f4b728eea1f902b.tar.gz otp-3694a010d2c5ec63f97405519f4b728eea1f902b.tar.bz2 otp-3694a010d2c5ec63f97405519f4b728eea1f902b.zip |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Conflicts:
make/otp_version_tickets
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ssl/doc/src/notes.xml | 17 | ||||
-rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index b036463e87..cee6752020 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,23 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 9.2.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + With the default BEAST Mitigation strategy for TLS 1.0 an + empty TLS fragment could be sent after a one-byte + fragment. This glitch has been fixed.</p> + <p> + Own Id: OTP-15054 Aux Id: ERIERL-346 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 9.2.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index c4bcc1560c..98070f794c 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 9.2.1 +SSL_VSN = 9.2.2 |