aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-07-11 17:18:53 +0200
committerErlang/OTP <[email protected]>2019-07-11 17:18:53 +0200
commit61daf50ebe9f82678781ee45a3afe0cd40ddcf47 (patch)
tree6c57f78fe3e3470502953fdece50336eb07a0b8e /lib/ssl
parentb4d3bd3f798f3be182f2d1195269cc761b7a27ad (diff)
downloadotp-61daf50ebe9f82678781ee45a3afe0cd40ddcf47.tar.gz
otp-61daf50ebe9f82678781ee45a3afe0cd40ddcf47.tar.bz2
otp-61daf50ebe9f82678781ee45a3afe0cd40ddcf47.zip
Prepare release
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/notes.xml16
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 17 insertions, 1 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