diff options
| author | Erlang/OTP <[email protected]> | 2019-07-11 17:18:53 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-07-11 17:18:53 +0200 |
| commit | 61daf50ebe9f82678781ee45a3afe0cd40ddcf47 (patch) | |
| tree | 6c57f78fe3e3470502953fdece50336eb07a0b8e | |
| parent | b4d3bd3f798f3be182f2d1195269cc761b7a27ad (diff) | |
| download | otp-61daf50ebe9f82678781ee45a3afe0cd40ddcf47.tar.gz otp-61daf50ebe9f82678781ee45a3afe0cd40ddcf47.tar.bz2 otp-61daf50ebe9f82678781ee45a3afe0cd40ddcf47.zip | |
Prepare release
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 430ac5bb44..b40ef246e7 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,22 @@ </header> <p>This document describes the changes made to the SSL application.</p> +<section><title>SSL 9.2.3.5</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Handling of zero size fragments in TLS could cause an + infinite loop. This has now been corrected.</p> + <p> + Own Id: OTP-15328 Aux Id: ERIERL-379 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 9.2.3.4</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 603e6f6267..2d06ae318b 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 9.2.3.4 +SSL_VSN = 9.2.3.5 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index d81a661508..bb0606fd67 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,5 +1 @@ -OTP-15909 -OTP-15910 -OTP-15938 -OTP-15939 -OTP-15941 +OTP-15328 |