diff options
| author | Erlang/OTP <[email protected]> | 2018-03-15 11:42:49 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-03-15 11:42:49 +0100 |
| commit | 56c9cbc73c088e84d2c61be41d9f8056655a5242 (patch) | |
| tree | 2dbeb9e8a853fdbb1d9e84326427ed46df48350d | |
| parent | a113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff) | |
| parent | f8d4d6ca6266b2096ec7e8cc971f7aa5e6d442f8 (diff) | |
| download | otp-56c9cbc73c088e84d2c61be41d9f8056655a5242.tar.gz otp-56c9cbc73c088e84d2c61be41d9f8056655a5242.tar.bz2 otp-56c9cbc73c088e84d2c61be41d9f8056655a5242.zip | |
Merge branch 'ingela/ssl/filter-bug/OTP-14981' into maint-20
* ingela/ssl/filter-bug/OTP-14981:
ssl: Prepare for release
ssl: Remove duplicate release note
ssl: Fix filter function to not discard AEAD cipher suites
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 7 | ||||
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
4 files changed, 5 insertions, 8 deletions
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 @@ -64,13 +64,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> 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/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). 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 |