commit 9f44c883f4d4970221ae711ae1f7b597768435d9
author Ronald Cron <ronald.cron@arm.com> Wed Aug 28 16:44:10 2024 +0200
committer Ronald Cron <ronald.cron@arm.com> Wed Aug 28 17:47:46 2024 +0200
tree 2856cc9772d7d815de6d928ce90fc49ecf8c8425
parent c9884b04add0bc1e392c985b8ee200bc5ee9bba9

Rename some "new_session_tickets" symbols

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

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 10cb684..1e4c42c 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2955,12 +2955,12 @@
 }
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
-static inline int mbedtls_ssl_conf_is_new_session_tickets_enabled(
+static inline int mbedtls_ssl_conf_is_signal_new_session_tickets_enabled(
     const mbedtls_ssl_config *conf)
 {
     return conf->session_tickets & MBEDTLS_SSL_SESSION_TICKETS_TLS1_3_MASK ?
-           MBEDTLS_SSL_NEW_SESSION_TICKETS_ENABLED :
-           MBEDTLS_SSL_NEW_SESSION_TICKETS_DISABLED;
+           MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_ENABLED :
+           MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_DISABLED;
 }
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
 #endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index f7c12a8..ef722d7 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -5595,8 +5595,8 @@
         if (ssl_tls13_is_new_session_ticket(ssl)) {
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
             MBEDTLS_SSL_DEBUG_MSG(3, ("NewSessionTicket received"));
-            if (mbedtls_ssl_conf_is_new_session_tickets_enabled(ssl->conf) ==
-                MBEDTLS_SSL_NEW_SESSION_TICKETS_ENABLED) {
+            if (mbedtls_ssl_conf_is_signal_new_session_tickets_enabled(ssl->conf) ==
+                MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_ENABLED) {
                 ssl->keep_current_message = 1;
 
                 mbedtls_ssl_handshake_set_state(ssl,

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index fe1a1ef..07eee6b 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3018,11 +3018,11 @@
 }
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
-void mbedtls_ssl_conf_enable_new_session_tickets(mbedtls_ssl_config *conf,
-                                                 int use_new_session_tickets)
+void mbedtls_ssl_conf_tls13_enable_signal_new_session_tickets(
+    mbedtls_ssl_config *conf, int signal_new_session_tickets)
 {
     conf->session_tickets &= ~MBEDTLS_SSL_SESSION_TICKETS_TLS1_3_MASK;
-    conf->session_tickets |= (use_new_session_tickets != 0) <<
+    conf->session_tickets |= (signal_new_session_tickets != 0) <<
                              MBEDTLS_SSL_SESSION_TICKETS_TLS1_3_BIT;
 }
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
@@ -5893,7 +5893,8 @@
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
         mbedtls_ssl_conf_session_tickets(conf, MBEDTLS_SSL_SESSION_TICKETS_ENABLED);
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
-        mbedtls_ssl_conf_enable_new_session_tickets(conf, MBEDTLS_SSL_NEW_SESSION_TICKETS_DISABLED);
+        mbedtls_ssl_conf_tls13_enable_signal_new_session_tickets(
+            conf, MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_DISABLED);
 #endif
 #endif
     }