commit 33ff868dca6a29c2cb78537dc89f51815e1c65a4
author Xiaokang Qian <xiaokang.qian@arm.com> Tue Jan 10 06:32:12 2023 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Wed Feb 08 05:47:47 2023 +0000
tree 1804fe6262a72cd176822f05addbb536d0fb3855
parent 43a83f247cdf787d5a0e46d14834389affe0ef2b

Fix various errors

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

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 086f980..2d805ad 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1180,7 +1180,9 @@
     mbedtls_time_t MBEDTLS_PRIVATE(start);       /*!< starting time      */
 #endif
     int MBEDTLS_PRIVATE(ciphersuite);            /*!< chosen ciphersuite */
+#if defined(MBEDTLS_SSL_SESSION_TICKETS)
     int MBEDTLS_PRIVATE(res_ciphersuite);        /*!< resumption ciphersuite */
+#endif
     size_t MBEDTLS_PRIVATE(id_len);              /*!< session id length  */
     unsigned char MBEDTLS_PRIVATE(id)[32];       /*!< session identifier */
     unsigned char MBEDTLS_PRIVATE(master)[48];   /*!< the master secret  */

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index cd36ea8..b796525 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -1106,7 +1106,8 @@
     }
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
-    if (ssl->session_negotiate->res_ciphersuite !=
+    if (ssl->handshake->resume &&
+        ssl->session_negotiate->res_ciphersuite !=
         ssl->session_negotiate->ciphersuite) {
         MBEDTLS_SSL_DEBUG_MSG(
             1, ("Invalid ciphersuite for session ticket psk."));
@@ -1702,8 +1703,10 @@
     mbedtls_ssl_optimize_checksum(ssl, ciphersuite_info);
 
     handshake->ciphersuite_info = ciphersuite_info;
+#if defined(MBEDTLS_SSL_SESSION_TICKETS)
     ssl->session_negotiate->res_ciphersuite =
         ssl->session_negotiate->ciphersuite;
+#endif
     ssl->session_negotiate->ciphersuite = cipher_suite;
 
     MBEDTLS_SSL_DEBUG_MSG(3, ("server hello, chosen ciphersuite: ( %04x ) - %s",
@@ -2984,10 +2987,12 @@
             if (ret == 0) {
                 mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_SERVER_HELLO);
 
+#if defined(MBEDTLS_SSL_EARLY_DATA)
                 MBEDTLS_SSL_DEBUG_MSG(
                     1, ("Switch to early data keys for outbound traffic"));
                 mbedtls_ssl_set_outbound_transform(
                     ssl, ssl->handshake->transform_earlydata);
+#endif
             }
             break;
 #endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */