commit b89c4f35a1362d1cc56c375a87a584cde6816701
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jan 21 13:24:10 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jan 21 13:24:10 2015 +0000
tree 383c2c7a96cfa6c0d6af80d8171e2d4fb05118ed
parent 0af1ba3521fc699f25ad76dd3eba092a0c5f458c

Fixes for the renego-option merge

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 6621faa..dc80ed0 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1345,7 +1345,12 @@
     msg_len = ( ssl->in_len[0] << 8 ) | ssl->in_len[1];
 
 #if defined(POLARSSL_SSL_RENEGOTIATION)
-    if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
+    if( ssl->renegotiation != SSL_INITIAL_HANDSHAKE )
+    {
+        /* Set by ssl_read_record() */
+        msg_len = ssl->in_hslen;
+    }
+    else
 #endif
     {
         if( msg_len > SSL_MAX_CONTENT_LEN )
@@ -1368,11 +1373,6 @@
 #endif
             ssl->in_left = 0;
     }
-    else
-    {
-        /* Set by ssl_read_record() */
-        msg_len = ssl->in_hslen;
-    }
 
     buf = ssl->in_msg;