Fixes for the renego-option merge

This commit is contained in:
Manuel Pégourié-Gonnard 2015-01-21 13:24:10 +00:00
parent 0af1ba3521
commit b89c4f35a1
2 changed files with 12 additions and 12 deletions

View file

@ -1345,7 +1345,12 @@ read_record_header:
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 @@ read_record_header:
#endif
ssl->in_left = 0;
}
else
{
/* Set by ssl_read_record() */
msg_len = ssl->in_hslen;
}
buf = ssl->in_msg;