From fec1afc6585c77fb949c84659930e403550d5928 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 23 Sep 2014 14:31:52 +0200
Subject: ssl: Servers may include an empty SNI-extension

---
 lib/ssl/src/ssl_handshake.erl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/ssl/src')

diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 22673e46e2..88ccb94e0b 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1732,6 +1732,9 @@ dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len),
 							#ec_point_formats{ec_point_format_list =
 									      ECPointFormats}});
 
+dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), Rest/binary>>, Acc) when Len == 0 ->
+    dec_hello_extensions(Rest, Acc#hello_extensions{sni = ""}); %% Server may send an empy SNI
+
 dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len),
                 ExtData:Len/binary, Rest/binary>>, Acc) ->
     <<?UINT16(_), NameList/binary>> = ExtData,
-- 
cgit v1.2.3


From 770000806112916bebbddf370f49ec501c0b8e69 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 8 Oct 2014 15:23:10 +0200
Subject: ssl: Prepare for release

---
 lib/ssl/src/ssl.appup.src | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/ssl/src')

diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 650901ef54..9d692379b4 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,7 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {"5.3.6", [{load_module, ssl_handshake, soft_purge, soft_purge, [ssl_connection]}]},
   {"5.3.5", [{load_module, ssl, soft_purge, soft_purge, [ssl_connection]},
 		     {load_module, ssl_handshake, soft_purge, soft_purge, [ssl_certificate]},
 		     {load_module, ssl_certificate, soft_purge, soft_purge, []},
@@ -12,6 +13,7 @@
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
  [
+  {"5.3.6", [{load_module, ssl_handshake, soft_purge, soft_purge, [ssl_connection]}]},
   {"5.3.5", [{load_module, ssl, soft_purge, soft_purge,[ssl_certificate]},
 		     {load_module, ssl_handshake, soft_purge, soft_purge,[ssl_certificate]},
 		     {load_module, ssl_certificate, soft_purge, soft_purge,[]},
-- 
cgit v1.2.3