commit 3643fdbab98a2bd38cc9154e3285b9e23f46b404
author Pengyu Lv <pengyu.lv@arm.com> Thu Jan 12 16:46:28 2023 +0800
committer Pengyu Lv <pengyu.lv@arm.com> Fri Jan 13 11:06:02 2023 +0800
tree e4c550dbd1ea7eec2d82b17e3b32847a7fa1e53c
parent c1334d934c81ca0de0f2160fae9152bf61c62f07

refine the state setting in tls13_handshake_wrapup

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 16317c0..aaf2be3 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -2568,21 +2568,20 @@
 
     mbedtls_ssl_tls13_handshake_wrapup(ssl);
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
+#if defined(MBEDTLS_SSL_SESSION_TICKETS) && \
+    defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED)
 /* TODO: Remove the check of SOME_PSK_ENABLED since SESSION_TICKETS requires
  *       SOME_PSK_ENABLED to be enabled. Here is just to make CI happy. It is
  *       expected to be resolved with issue#6395.
  */
-#if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED)
     /* Sent NewSessionTicket message only when client supports PSK */
-    if (!mbedtls_ssl_tls13_some_psk_enabled(ssl)) {
-        mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_HANDSHAKE_OVER);
+    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_TLS1_3_NEW_SESSION_TICKET);
-#else
-    mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_HANDSHAKE_OVER);
-#endif
+    {
+        mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_HANDSHAKE_OVER);
+    }
     return 0;
 }