commit 7b80c64de424e26013e790dfad0703ebbb0a1f42
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 02 16:21:30 2019 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 02 16:24:55 2019 +0200
tree fa84b4a22826bf32b8ca977b37d0b18c7a208439
parent 1772c9fac5b24f700e2335bce34be4d36922534d

Fix compile-time guard for optional field in struct

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 316d537..d25942b 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7275,10 +7275,6 @@
 
 void mbedtls_ssl_handshake_wrapup( mbedtls_ssl_context *ssl )
 {
-#if !defined(MBEDTLS_SSL_NO_SESSION_CACHE)
-    int resume = ssl->handshake->resume;
-#endif /* !MBEDTLS_SSL_NO_SESSION_CACHE */
-
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "=> handshake wrapup" ) );
 
 #if defined(MBEDTLS_SSL_RENEGOTIATION)
@@ -7306,18 +7302,18 @@
     ssl->session = ssl->session_negotiate;
     ssl->session_negotiate = NULL;
 
-#if !defined(MBEDTLS_SSL_NO_SESSION_CACHE)
+#if defined(MBEDTLS_SSL_SRV_C) && !defined(MBEDTLS_SSL_NO_SESSION_CACHE)
     /*
      * Add cache entry
      */
     if( ssl->conf->f_set_cache != NULL &&
         ssl->session->id_len != 0 &&
-        resume == 0 )
+        ssl->handshake->resume == 0 )
     {
         if( ssl->conf->f_set_cache( ssl->conf->p_cache, ssl->session ) != 0 )
             MBEDTLS_SSL_DEBUG_MSG( 1, ( "cache did not store session" ) );
     }
-#endif /* !MBEDTLS_SSL_NO_SESSION_CACHE */
+#endif /* MBEDTLS_SSL_SRV_C && !MBEDTLS_SSL_NO_SESSION_CACHE */
 
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
     if( MBEDTLS_SSL_TRANSPORT_IS_DTLS( ssl->conf->transport ) &&