aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-04-17 16:14:48 +0200
committerErlang/OTP <[email protected]>2019-04-17 16:14:48 +0200
commita6763442e7a3104dc940db035647ea939e57fb23 (patch)
treeaea7c11eaf88c0364f7d1a198254dbfb2e4ead73
parent1f86f261c55fe2a69b3b03e9a4b097925dc70263 (diff)
downloadotp-a6763442e7a3104dc940db035647ea939e57fb23.tar.gz
otp-a6763442e7a3104dc940db035647ea939e57fb23.tar.bz2
otp-a6763442e7a3104dc940db035647ea939e57fb23.zip
Prepare release
-rw-r--r--lib/ssl/doc/src/notes.xml17
-rw-r--r--lib/ssl/vsn.mk2
-rw-r--r--make/otp_version_tickets4
3 files changed, 19 insertions, 4 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
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 52e2e9cb78..05a281bb2c 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,3 +1 @@
-OTP-15766
-OTP-15768
-OTP-15769
+OTP-15054