From dbf6073fa34121e61742ab8102fafe87f2cc5436 Mon Sep 17 00:00:00 2001 From: Jarno Lamsa Date: Wed, 19 Jun 2019 16:20:30 +0300 Subject: [PATCH] Fix ssl_cli resumption guards --- library/ssl_cli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 01025cae5..710ffa4db 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -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",