aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-03-13 13:29:03 +0100
committerIngela Anderton Andin <[email protected]>2015-03-13 13:29:03 +0100
commit90e3fdf7a7ed036d51fcd0477141343af9f1cc30 (patch)
treee7aca7375e491169ff6a3ec79da163c21614d15e
parent96d330814fd8195b0d33d1c33e0683e1fbf752ea (diff)
downloadotp-90e3fdf7a7ed036d51fcd0477141343af9f1cc30.tar.gz
otp-90e3fdf7a7ed036d51fcd0477141343af9f1cc30.tar.bz2
otp-90e3fdf7a7ed036d51fcd0477141343af9f1cc30.zip
ssl: Special Poodle protection version for OTP-R15 track
-rw-r--r--lib/ssl/src/ssl.appup.src10
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index c04d29bfc6..89eb5a240b 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,18 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"5.1.2", [{restart_application, ssl}]},
- {"5.1.1", [{restart_application, ssl}]},
- {"5.1", [{restart_application, ssl}]},
- {<<"5.0\\*">>, [{restart_application, ssl}]},
+ {<<"5\\.*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}
],
[
- {"5.1.2", [{restart_application, ssl}]},
- {"5.1.1", [{restart_application, ssl}]},
- {"5.1", [{restart_application, ssl}]},
- {<<"5.0\\*">>, [{restart_application, ssl}]},
+ {<<"5\\.*">>, [{restart_application, ssl}]},
{<<"4\\.*">>, [{restart_application, ssl}]},
{<<"3\\.*">>, [{restart_application, ssl}]}
]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index f7abd84345..a4e1710696 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.2.1.2
+SSL_VSN = 5.2.1.3