From 01e9582332fd17aad51a8b6a4212f72387699359 Mon Sep 17 00:00:00 2001
From: Andreas Schultz <aschultz@tpip.net>
Date: Tue, 5 Jan 2016 15:19:26 +0100
Subject: dtls: fix encoding of client hello cookie

---
 lib/ssl/src/dtls_handshake.erl | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'lib/ssl/src/dtls_handshake.erl')

diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index d52f26e578..c6535d5928 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -445,29 +445,23 @@ enc_handshake(#client_hello{client_version = {Major, Minor},
 			       cookie = Cookie,
 			       cipher_suites = CipherSuites,
 			       compression_methods = CompMethods,
-			       extensions = HelloExtensions}, Version) ->
+			       extensions = HelloExtensions}, _Version) ->
     SIDLength = byte_size(SessionID),
-    BinCookie = enc_client_hello_cookie(Version, Cookie),
+    CookieLength = byte_size(Cookie),
     BinCompMethods = list_to_binary(CompMethods),
     CmLength = byte_size(BinCompMethods),
     BinCipherSuites = list_to_binary(CipherSuites),
     CsLength = byte_size(BinCipherSuites),
     ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
-    
+
     {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
  		      ?BYTE(SIDLength), SessionID/binary,
- 		      BinCookie/binary,
+		      ?BYTE(CookieLength), Cookie/binary,
 		      ?UINT16(CsLength), BinCipherSuites/binary,
  		      ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
 enc_handshake(HandshakeMsg, Version) ->
     ssl_handshake:encode_handshake(HandshakeMsg, Version).
 
-enc_client_hello_cookie(_, <<>>) ->
-    <<>>;
-enc_client_hello_cookie(_, Cookie) ->
-    CookieLength = byte_size(Cookie),
-    <<?BYTE(CookieLength), Cookie/binary>>.
-
 decode_handshake(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 					    ?BYTE(SID_length), Session_ID:SID_length/binary,
 					    ?BYTE(Cookie_length), Cookie:Cookie_length/binary,
-- 
cgit v1.2.3