diff options
author | Erlang/OTP <[email protected]> | 2015-12-03 11:11:01 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-12-03 11:11:01 +0100 |
commit | 64fd2820d57282ab782fb5f7edec643fdd08f117 (patch) | |
tree | 4ba93480de4584711fb928ecefd8337779de5b13 /lib/ssl/src/ssl.appup.src | |
parent | df7c7b59c9f1b796e72d1d27a35a61f1392d7f23 (diff) | |
parent | 97531f2f4dbd4bf7426434792e7e6af6aa8e12ef (diff) | |
download | otp-64fd2820d57282ab782fb5f7edec643fdd08f117.tar.gz otp-64fd2820d57282ab782fb5f7edec643fdd08f117.tar.bz2 otp-64fd2820d57282ab782fb5f7edec643fdd08f117.zip |
Merge branch 'ia/ssl/maint-17/backport-of-18-fix' into maint-17
* ia/ssl/maint-17/backport-of-18-fix:
ssl: Prepare for release
ssl: Do not crash on proprietary hash_sign algorithms
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
-rw-r--r-- | lib/ssl/src/ssl.appup.src | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index d100e41930..4c4163d7fd 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,14 +1,18 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"6.0">>, [{load_module, ssl_handshake, soft_purge, soft_purge, []}]}, + {<<"6.0.1">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]}, + {<<"6.0">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}, + {load_module, ssl_handshake, soft_purge, soft_purge, []}]}, {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]}, {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, {<<"3\\..*">>, [{restart_application, ssl}]} ], [ - {<<"6.0">>, [{load_module, ssl_handshake, soft_purge, soft_purge, []}]}, + {<<"6.0.1">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]}, + {<<"6.0">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}, + {load_module, ssl_handshake, soft_purge, soft_purge, []}]}, {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]}, {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, |