aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src/notes.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-03-16 10:45:00 +0100
committerIngela Anderton Andin <[email protected]>2018-03-16 10:45:00 +0100
commitbdbb5f0376678c0aae289b3f9264a2bd4d9b96ee (patch)
treee7da8f2ba00ee881a540845d6e98f042a9454400 /lib/ssl/doc/src/notes.xml
parent845dd68493a91decc32d50cc785e6afaf9dfb6c3 (diff)
parent0f2ead7bedeedc852db2deeeaa0e9e096bba8c0f (diff)
downloadotp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.tar.gz
otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.tar.bz2
otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes ssl: Prepare for release ssl: Remove duplicate release note ssl: Fix filter function to not discard AEAD cipher suites Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssl/doc/src/notes.xml')
-rw-r--r--lib/ssl/doc/src/notes.xml23
1 files changed, 16 insertions, 7 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 14ba12167a..4ad7da9486 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 8.2.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix filter function to not incorrectly exclude AEAD
+ cipher suites</p>
+ <p>
+ Own Id: OTP-14981</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 8.2.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
@@ -64,13 +80,6 @@
</item>
<item>
<p>
- Fix alert handling so that unexpected messages are logged
- and alerted correctly</p>
- <p>
- Own Id: OTP-14929</p>
- </item>
- <item>
- <p>
Correct handling of anonymous cipher suites</p>
<p>
Own Id: OTP-14952</p>