aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-11 15:24:40 +0100
committerIngela Anderton Andin <[email protected]>2015-02-13 09:47:21 +0100
commitd8cdf2d5a069e44935fadc7e0fa3483c93fe5297 (patch)
treee086c60c1beea2d42c8a0637b1de1cfa26addf18
parent783d5aaa36d9c084805269f7a9e019b1cbf2a29f (diff)
downloadotp-d8cdf2d5a069e44935fadc7e0fa3483c93fe5297.tar.gz
otp-d8cdf2d5a069e44935fadc7e0fa3483c93fe5297.tar.bz2
otp-d8cdf2d5a069e44935fadc7e0fa3483c93fe5297.zip
ssl: Prepare for 18
-rw-r--r--lib/ssl/src/ssl.appup.src8
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 7986722094..1476336039 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,14 +1,14 @@
%% -*- erlang -*-
{"%VSN%",
[
- {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
- {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"6\\..*">>, [{restart_application, ssl}]},
+ {<<"5\\..*">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {<<"5\\.3\\.[1-7]($|\\..*)">>, [{restart_application, ssl}]},
- {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"6\\..*">>, [{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 bda974da0e..171147adf2 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.3.8
+SSL_VSN = 7.0