TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-03-24 13:11:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ssl_cli resumption guards

Browse Source
This commit is contained in:
Jarno Lamsa
2019-06-19 16:20:30 +03:00
committed by Manuel Pégourié-Gonnard
parent 4f74f6d301
commit dbf6073fa3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/ssl_cli.c
View File

@@ -1805,9 +1805,6 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl )
*/
#if defined(MBEDTLS_SSL_SESSION_RESUMPTION)
if( ssl->handshake->resume == 0 || n == 0 ||
#else
if( n == 0 ||
#endif /* MBEDTLS_SSL_SESSION_RESUMPTION */
#if defined(MBEDTLS_SSL_RENEGOTIATION)
ssl->renego_status != MBEDTLS_SSL_INITIAL_HANDSHAKE ||
#endif
@@ -1815,6 +1812,7 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl )
ssl->session_negotiate->compression != comp ||
ssl->session_negotiate->id_len != n ||
memcmp( ssl->session_negotiate->id, buf + 35, n ) != 0 )
#endif /* MBEDTLS_SSL_SESSION_RESUMPTION */
{
ssl->state++;
#if defined(MBEDTLS_SSL_SESSION_RESUMPTION)
@@ -1828,6 +1826,7 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl )
ssl->session_negotiate->id_len = n;
memcpy( ssl->session_negotiate->id, buf + 35, n );
}
#if defined(MBEDTLS_SSL_SESSION_RESUMPTION)
else
{
ssl->state = MBEDTLS_SSL_SERVER_CHANGE_CIPHER_SPEC;
@@ -1840,6 +1839,7 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl )
return( ret );
}
}
#endif /* MBEDTLS_SSL_SESSION_RESUMPTION */
#if defined(MBEDTLS_SSL_SESSION_RESUMPTION)
MBEDTLS_SSL_DEBUG_MSG( 3, ( "%s session has been resumed",