commit 3e47eec4311b1d3e3d45b8e4b1864b4338f5426d
author Ronald Cron <ronald.cron@arm.com> Wed Feb 21 10:29:24 2024 +0100
committer Ronald Cron <ronald.cron@arm.com> Fri Mar 08 08:43:41 2024 +0100
tree b4456e671db0c4563915f47c8b46ff061291671f
parent e8c162d7ba89ed7fc32e1797d829ecaa24f818c0

tls13: srv: Simplify resumption detection

Avoid marking we resume and then
cancelling it.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index a496981..391b8d4 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -309,13 +309,11 @@
     *psk_type = MBEDTLS_SSL_TLS1_3_PSK_EXTERNAL;
 
     MBEDTLS_SSL_DEBUG_BUF(4, "identity", identity, identity_len);
-    ssl->handshake->resume = 0;
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
     ret = ssl_tls13_offered_psks_check_identity_match_ticket(
         ssl, identity, identity_len, obfuscated_ticket_age, session);
     if (ret == SSL_TLS1_3_PSK_IDENTITY_MATCH) {
-        ssl->handshake->resume = 1;
         *psk_type = MBEDTLS_SSL_TLS1_3_PSK_RESUMPTION;
         ret = mbedtls_ssl_set_hs_psk(ssl,
                                      session->resumption_key,
@@ -1721,10 +1719,13 @@
         return MBEDTLS_ERR_SSL_ILLEGAL_PARAMETER;
     }
 
-    if (handshake->key_exchange_mode ==
-        MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL) {
-        handshake->resume = 0;
+#if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED)
+    if ((handshake->key_exchange_mode !=
+         MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL) &&
+        (psk.type == MBEDTLS_SSL_TLS1_3_PSK_RESUMPTION)) {
+        handshake->resume = 1;
     }
+#endif
 
     if (handshake->key_exchange_mode !=
         MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK) {