diff options
| author | Raimo Niskanen <[email protected]> | 2019-04-18 13:55:41 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-04-18 13:55:41 +0200 |
| commit | d0482d868f4662ebebeb115878ea1f99da69f062 (patch) | |
| tree | 2955c9be9e100e0c5b458f99bf37a17a1ddd8a74 /lib | |
| parent | 9764c554546e6edbbf1b3ddbf68298f8f8fdec82 (diff) | |
| parent | 3694a010d2c5ec63f97405519f4b728eea1f902b (diff) | |
| download | otp-d0482d868f4662ebebeb115878ea1f99da69f062.tar.gz otp-d0482d868f4662ebebeb115878ea1f99da69f062.tar.bz2 otp-d0482d868f4662ebebeb115878ea1f99da69f062.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Conflicts:
OTP_VERSION
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 a511cb4db3..f0231da2ad 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 |