[Pkg-erlang-commits] r1678 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2014-09-27 15:06:21 +0000 (Sat, 27 Sep 2014)
New Revision: 1678

Added:
   erlang/trunk/debian/patches/ssl.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/series
Log:
[erlang]
  * Added a patch from upstream which fixes empty SNI-extension processing.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2014-09-27 06:21:39 UTC (rev 1677)
+++ erlang/trunk/debian/changelog	2014-09-27 15:06:21 UTC (rev 1678)
@@ -3,8 +3,9 @@
   * New upstream release.
   * Refreshed patches. Removed patch which fixed some functions not
     following symlinks since it has been included into the upstream release.
+  * Added a patch from upstream which fixes empty SNI-extension processing.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Sep 2014 10:21:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Sep 2014 19:05:53 +0400
 
 erlang (1:17.1-dfsg-7) unstable; urgency=medium
 

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2014-09-27 06:21:39 UTC (rev 1677)
+++ erlang/trunk/debian/patches/series	2014-09-27 15:06:21 UTC (rev 1678)
@@ -8,3 +8,4 @@
 java.patch
 hppa.patch
 javascript.patch
+ssl.patch

Added: erlang/trunk/debian/patches/ssl.patch
===================================================================
--- erlang/trunk/debian/patches/ssl.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/ssl.patch	2014-09-27 15:06:21 UTC (rev 1678)
@@ -0,0 +1,13 @@
+--- a/lib/ssl/src/ssl_handshake.erl
++++ b/lib/ssl/src/ssl_handshake.erl
+@@ -1732,6 +1732,10 @@
+ 							#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,