From b254363cab0b54fffde44fb6fd217143de028dfe Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 25 Feb 2014 16:02:07 +0100
Subject: ssl: Fix appup regexps and instructions

---
 lib/ssl/src/ssl.appup.src | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index d53c58ff86..b0ef292c4e 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -9,11 +9,10 @@
   {"5.3.2", [{load_module, ssl, soft_purge, soft_purge, []},
 	     {load_module, ssl_connection, soft_purge, soft_purge, []},
 	     {load_module, ssl_handshake, soft_purge, soft_purge, []},
+	     {load_module, tls_handshake, soft_purge, soft_purge, []},
 	     {load_module, tls_connection, soft_purge, soft_purge, []}]},
-  {"5.3.1", [{restart_application, ssl}]},
-  {<<"5\\.2\\*">>, [{restart_application, ssl}]},
-  {<<"5\\.1\\*">>, [{restart_application, ssl}]},
-  {<<"5\\.0\\*">>, [{restart_application, ssl}]},
+  {<<"5\\.3\\.1($|\\..*)">>, [{restart_application, ssl}]},
+  {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
   {<<"4\\..*">>, [{restart_application, ssl}]},
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
@@ -26,11 +25,10 @@
   {"5.3.2", [{load_module, ssl, soft_purge, soft_purge, []},
 	     {load_module, ssl_connection, soft_purge, soft_purge, []},
 	     {load_module, ssl_handshake, soft_purge, soft_purge, []},
+	     {load_module, tls_handshake, soft_purge, soft_purge, []},
 	     {load_module, tls_connection, soft_purge, soft_purge, []}]},
-  {"5.3.1", [{restart_application, ssl}]},
-  {<<"5\\.2.*">>, [{restart_application, ssl}]},
-  {<<"5\\.1.*">>, [{restart_application, ssl}]},
-  {<<"5\\.0.*">>, [{restart_application, ssl}]},
+  {<<"5\\.3\\.1($|\\..*)">>, [{restart_application, ssl}]},
+  {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
   {<<"4\\..*">>, [{restart_application, ssl}]},
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ]
-- 
cgit v1.2.3


From 6303b6e4cdf3da296a83fd9b1c76302e36dcc912 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 25 Feb 2014 16:28:22 +0100
Subject: ssl: Fix compiler warnings

---
 lib/ssl/src/ssl_handshake.erl |  3 +--
 lib/ssl/src/ssl_sup.erl       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 7b4cf8eb06..245cd3e280 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -315,8 +315,7 @@ finished(Version, Role, PrfAlgo, MasterSecret, {Handshake, _}) -> % use the curr
 
 %% ---------- Handle handshake messages  ----------
 
-verify_server_key(#server_key_params{params = Params,
-				     params_bin = EncParams,
+verify_server_key(#server_key_params{params_bin = EncParams,
 				     signature = Signature},
 		  HashSign = {HashAlgo, _},
 		  ConnectionStates, Version, PubKeyInfo) ->
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl
index 77b40a7b38..e1aeb11ca4 100644
--- a/lib/ssl/src/ssl_sup.erl
+++ b/lib/ssl/src/ssl_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -89,14 +89,14 @@ tls_connection_manager_child_spec() ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-dtls_connection_manager_child_spec() ->
-    Name = dtls_connection,  
-    StartFunc = {dtls_connection_sup, start_link, []},
-    Restart = permanent, 
-    Shutdown = 4000,
-    Modules = [dtls_connection, ssl_connection],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+%% dtls_connection_manager_child_spec() ->
+%%     Name = dtls_connection,  
+%%     StartFunc = {dtls_connection_sup, start_link, []},
+%%     Restart = permanent, 
+%%     Shutdown = 4000,
+%%     Modules = [dtls_connection, ssl_connection],
+%%     Type = supervisor,
+%%     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
 session_cb_init_args() ->
     case application:get_env(ssl, session_cb_init_args) of
-- 
cgit v1.2.3