commit dbf6073fa34121e61742ab8102fafe87f2cc5436
author Jarno Lamsa <jarno.lamsa@arm.com> Wed Jun 19 16:20:30 2019 +0300
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 02 15:12:29 2019 +0200
tree c38e86112beaa023d00e2e8827c23b4533071924
parent 4f74f6d3010322b0f573e6908d4e4b45e5cd4a8c

Fix ssl_cli resumption guards

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 01025ca..710ffa4 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1805,9 +1805,6 @@
      */
 #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 @@
         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 @@
         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 @@
             return( ret );
         }
     }
+#endif /* MBEDTLS_SSL_SESSION_RESUMPTION */
 
 #if defined(MBEDTLS_SSL_SESSION_RESUMPTION)
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "%s session has been resumed",