commit 03409290d2bd418d0e105f1283b131f5dbe15d6f
author Xiaokang Qian <xiaokang.qian@arm.com> Wed Oct 12 02:49:52 2022 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Wed Oct 12 11:06:51 2022 +0000
tree 64bf1b3af0d2aa3b19ad4517c01c5483d3ec8d0f
parent d7adc374d325dea0647e0c0c99b1270046116f90

Add MBEDTLS_SSL_SESSION_TICKETS guard to server name check

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

library/ssl_client.c

diff --git a/library/ssl_client.c b/library/ssl_client.c
index 48a19c9..baf82a6 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -872,6 +872,7 @@
     }
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
+    defined(MBEDTLS_SSL_SESSION_TICKETS) && \
     defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
     if( ssl->tls_version == MBEDTLS_SSL_VERSION_TLS1_3  &&
         ssl->handshake->resume )
@@ -885,14 +886,18 @@
         if( hostname_mismatch )
         {
             MBEDTLS_SSL_DEBUG_MSG( 1,
-            ( "hostname mismatch the session ticket, should not resume " ) );
+                ( "hostname mismatch the session ticket,"
+                  " should not resume " ) );
             return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
         }
     }
     else
-        mbedtls_ssl_session_set_hostname( ssl->session_negotiate,
-                                          ssl->hostname );
+    {
+        return mbedtls_ssl_session_set_hostname( ssl->session_negotiate,
+                                                 ssl->hostname );
+    }
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 &&
+          MBEDTLS_SSL_SESSION_TICKETS &&
           MBEDTLS_SSL_SERVER_NAME_INDICATION */
 
     return( 0 );