commit a6e5bd56548edffffcf696a7f680827db16e7fcf
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Jul 23 12:14:13 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Jul 23 12:23:19 2015 +0200
tree 72f0776d95af11a2c399eec3a83a54d2bc833318
parent cb0d212c973f3bcd34fd55e1a302e2686706fcd6

Fix bug with extension-less ServerHello

https://tls.mbed.org/discussions/bug-report-issues/server-hello-parsing-bug

in_hslen include the length of the handshake header. (We might want to change
that in the future, as it is a bit annoying.)

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 1d683d3..b09a7ab 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1269,7 +1269,7 @@
         return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
     }
 
-    if( ssl->in_hslen > 39 + n )
+    if( ssl->in_hslen > mbedtls_ssl_hs_hdr_len( ssl ) + 39 + n )
     {
         ext_len = ( ( buf[38 + n] <<  8 )
                   | ( buf[39 + n]       ) );
@@ -1281,7 +1281,7 @@
             return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
         }
     }
-    else if( ssl->in_hslen == 38 + n )
+    else if( ssl->in_hslen == mbedtls_ssl_hs_hdr_len( ssl ) + 38 + n )
     {
         ext_len = 0;
     }