diff options
| author | Erlang/OTP <[email protected]> | 2015-06-01 12:06:32 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-06-01 12:06:32 +0200 |
| commit | 27e0d318073323dc39f234607e02a56a54b2f80f (patch) | |
| tree | 89aeb0c21e34ef7abe5f84d8d2b740b9b552a416 /lib/ssl/src/ssl.appup.src | |
| parent | 6ba8e4dcff857ef6933a7c91c7d85c165977a970 (diff) | |
| parent | e672dc646520c7d8e4227c401fa3a60f6cbaf67b (diff) | |
| download | otp-27e0d318073323dc39f234607e02a56a54b2f80f.tar.gz otp-27e0d318073323dc39f234607e02a56a54b2f80f.tar.bz2 otp-27e0d318073323dc39f234607e02a56a54b2f80f.zip | |
Merge branch 'ia/ssl/crypto-bad-input/OTP-12783' into maint-17
* ia/ssl/crypto-bad-input/OTP-12783:
ssl: Prepare for release
ssl: Correct handling of bad input to premaster_secret calculation
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 7986722094..d100e41930 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,12 +1,14 @@ %% -*- erlang -*- {"%VSN%", [ + {<<"6.0">>, [{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, []}]}, {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]}, {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]}, {<<"4\\..*">>, [{restart_application, ssl}]}, |