commit c7af2c4f8c34b608136cc74d80b09566ed858a44
author Pengyu Lv <pengyu.lv@arm.com> Thu Dec 01 16:33:00 2022 +0800
committer Pengyu Lv <pengyu.lv@arm.com> Fri Jan 13 11:05:54 2023 +0800
tree 6e5b8d239795d87abd48621a7ac239af7dd2e76b
parent c55eeb682dfee25e870088dde92a14cea9c2da85

tls13: send new session ticket only when client supports psk

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 5f09c2f..2d2ad61 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -2568,10 +2568,14 @@
     mbedtls_ssl_tls13_handshake_wrapup(ssl);
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
-    mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_TLS1_3_NEW_SESSION_TICKET);
-#else
-    mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_HANDSHAKE_OVER);
+    /* Sent NewSessionTicket message only when client supports PSK */
+    if (mbedtls_ssl_tls13_some_psk_enabled(ssl)) {
+        mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_TLS1_3_NEW_SESSION_TICKET);
+    } else
 #endif
+    {
+        mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_HANDSHAKE_OVER);
+    }
     return 0;
 }