From 26cea5abd6f19d22dcc1c8a9bdb281670ca85851 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 15 Mar 2018 10:30:35 +0100
Subject: ssl: Fix filter function to not discard AEAD cipher suites

---
 lib/ssl/src/ssl_cipher.erl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/ssl')

diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 62a172ca7c..59cf05fd42 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -2175,6 +2175,8 @@ is_acceptable_cipher(Cipher, Algos) ->
 
 is_acceptable_hash(null, _Algos) ->
     true;
+is_acceptable_hash(aead, _Algos) ->
+    true;
 is_acceptable_hash(Hash, Algos) ->
     proplists:get_bool(Hash, Algos).
 
-- 
cgit v1.2.3


From 48f627f2a8485aa4e213df318853746fb54f416e Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 15 Mar 2018 11:31:51 +0100
Subject: ssl: Remove duplicate release note

---
 lib/ssl/doc/src/notes.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'lib/ssl')

diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 14ba12167a..810d55e25a 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -62,13 +62,6 @@
           <p>
 	    Own Id: OTP-14919</p>
         </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>
-- 
cgit v1.2.3


From f8d4d6ca6266b2096ec7e8cc971f7aa5e6d442f8 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 15 Mar 2018 11:41:16 +0100
Subject: ssl: Prepare for release

---
 lib/ssl/src/ssl.appup.src | 2 ++
 lib/ssl/vsn.mk            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/ssl')

diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index bfdd0c205b..4ad2a2f1fd 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {<<"8.2.4">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]},
   {<<"8\\..*">>, [{restart_application, ssl}]},
   {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
@@ -9,6 +10,7 @@
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
  [
+  {<<"8.2.4">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]},
   {<<"8\\..*">>, [{restart_application, ssl}]},
   {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 2ece6ef2d5..0ff22c5eab 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.2.4
+SSL_VSN = 8.2.5
-- 
cgit v1.2.3


From bd2a492ed0343abe98cf5e0a009bec9563279821 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 15 Mar 2018 11:42:56 +0100
Subject: Update release notes

---
 lib/ssl/doc/src/notes.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lib/ssl')

diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 810d55e25a..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>
-- 
cgit v1.2.3