commit 0619348288c3e9fb5fb930b96519b47ff7078918
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Feb 14 08:39:32 2014 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 21 16:30:06 2014 +0200
tree 8729214a2850c1d593a3f409f0d986d198b3c876
parent 507e1e410aeeee30b38bc4926b0853b0720687e9

Add explicit counter in DTLS record header

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 617db9d..5ab626a 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1134,7 +1134,7 @@
     SSL_DEBUG_MSG( 2, ( "=> parse client hello" ) );
 
     if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE &&
-        ( ret = ssl_fetch_input( ssl, 5 ) ) != 0 )
+        ( ret = ssl_fetch_input( ssl, ssl_hdr_len( ssl ) ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "ssl_fetch_input", ret );
         return( ret );
@@ -1147,7 +1147,7 @@
         return ssl_parse_client_hello_v2( ssl );
 #endif
 
-    SSL_DEBUG_BUF( 4, "record header", buf, 5 ); // TODO: 13 for DTLS
+    SSL_DEBUG_BUF( 4, "record header", buf, ssl_hdr_len( ssl ) );
 
     SSL_DEBUG_MSG( 3, ( "client hello v3, message type: %d",
                    buf[0] ) );
@@ -1191,7 +1191,7 @@
     }
 
     if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE &&
-        ( ret = ssl_fetch_input( ssl, 5 + n ) ) != 0 )
+        ( ret = ssl_fetch_input( ssl, ssl_hdr_len( ssl ) + n ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "ssl_fetch_input", ret );
         return( ret );
@@ -1199,7 +1199,7 @@
 
     buf = ssl->in_msg;
     if( !ssl->renegotiation )
-        n = ssl->in_left - 5;
+        n = ssl->in_left - ssl_hdr_len( ssl );
     else
         n = ssl->in_msglen;