aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-09-19 11:10:52 +0200
committerIngela Anderton Andin <[email protected]>2017-09-20 11:09:43 +0200
commit9deb17a8bf4db001ac3ade1caf53a073b8e17c87 (patch)
treed915bcc42fe5959f14350c2f10468e42dc44c9ed
parentaf68c9d17e99254c216c16a01167d95023cbd1cd (diff)
downloadotp-9deb17a8bf4db001ac3ade1caf53a073b8e17c87.tar.gz
otp-9deb17a8bf4db001ac3ade1caf53a073b8e17c87.tar.bz2
otp-9deb17a8bf4db001ac3ade1caf53a073b8e17c87.zip
public_key, ssl: Prepare for release
OTP-14236 requires ssl runtime dependencies to update to latest public_key. OTP-14181 makes ssl test cases dependent on latest version latest public_key.
-rw-r--r--lib/public_key/vsn.mk2
-rw-r--r--lib/ssl/src/ssl.app.src2
-rw-r--r--lib/ssl/vsn.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 83a77d2a28..bb96c2237d 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.4.1
+PUBLIC_KEY_VSN = 1.5
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 064dcd6892..51407ef3b9 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -63,7 +63,7 @@
{applications, [crypto, public_key, kernel, stdlib]},
{env, []},
{mod, {ssl_app, []}},
- {runtime_dependencies, ["stdlib-3.2","public_key-1.2","kernel-3.0",
+ {runtime_dependencies, ["stdlib-3.2","public_key-1.5","kernel-3.0",
"erts-7.0","crypto-3.3", "inets-5.10.7"]}]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 25b2a2bec0..bb77326751 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.2
+SSL_VSN = 8.2.1