commit b781a2323c8aa878b3370a6335479940b6d9483c
author Xiaokang Qian <xiaokang.qian@arm.com> Tue Nov 01 07:39:46 2022 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Mon Nov 14 03:13:51 2022 +0000
tree 9c4ba499128c659d29754592cf9cbadffdbb1817
parent 893ad8196689e0c75ec3a318bee1270da724222e

Move ssl_tls13_has_configured_ticket() back to tls13 client

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

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 52dbb3b..901c104 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1487,11 +1487,6 @@
 #endif /* !MBEDTLS_USE_PSA_CRYPTO */
 #endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
 
-#if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_SESSION_TICKETS)
-MBEDTLS_CHECK_RETURN_CRITICAL
-int mbedtls_ssl_tls13_has_configured_ticket( mbedtls_ssl_context *ssl );
-#endif
-
 #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED)
 #if defined(MBEDTLS_SSL_CLI_C)
 MBEDTLS_CHECK_RETURN_CRITICAL

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 945a2e9..da90b23 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1872,15 +1872,6 @@
 }
 #endif /* MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED */
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
-int mbedtls_ssl_tls13_has_configured_ticket( mbedtls_ssl_context *ssl )
-{
-    mbedtls_ssl_session *session = ssl->session_negotiate;
-    return( ssl->handshake->resume &&
-            session != NULL && session->ticket != NULL );
-}
-#endif
-
 #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED)
 int mbedtls_ssl_conf_has_static_psk( mbedtls_ssl_config const *conf )
 {

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 0d24474..bb7e14b 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -694,6 +694,14 @@
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
 MBEDTLS_CHECK_RETURN_CRITICAL
+static int ssl_tls13_has_configured_ticket( mbedtls_ssl_context *ssl )
+{
+    mbedtls_ssl_session *session = ssl->session_negotiate;
+    return( ssl->handshake->resume &&
+            session != NULL && session->ticket != NULL );
+}
+
+MBEDTLS_CHECK_RETURN_CRITICAL
 static int ssl_tls13_ticket_get_identity( mbedtls_ssl_context *ssl,
                                           psa_algorithm_t *hash_alg,
                                           const unsigned char **identity,
@@ -701,7 +709,7 @@
 {
     mbedtls_ssl_session *session = ssl->session_negotiate;
 
-    if( !mbedtls_ssl_tls13_has_configured_ticket( ssl ) )
+    if( !ssl_tls13_has_configured_ticket( ssl ) )
         return( -1 );
 
     *hash_alg = ssl_tls13_get_ciphersuite_hash_alg( session->ciphersuite );
@@ -719,7 +727,7 @@
 
     mbedtls_ssl_session *session = ssl->session_negotiate;
 
-    if( !mbedtls_ssl_tls13_has_configured_ticket( ssl ) )
+    if( !ssl_tls13_has_configured_ticket( ssl ) )
         return( -1 );
 
     *hash_alg = ssl_tls13_get_ciphersuite_hash_alg( session->ciphersuite );
@@ -766,7 +774,7 @@
 {
     int configured_psk_count = 0;
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
-    if( mbedtls_ssl_tls13_has_configured_ticket( ssl ) )
+    if( ssl_tls13_has_configured_ticket( ssl ) )
     {
         MBEDTLS_SSL_DEBUG_MSG( 3, ( "Ticket is configured" ) );
         configured_psk_count++;
@@ -1087,7 +1095,7 @@
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
     if( selected_identity == 0 &&
-        mbedtls_ssl_tls13_has_configured_ticket( ssl ) )
+        ssl_tls13_has_configured_ticket( ssl ) )
     {
         ret = ssl_tls13_ticket_get_psk( ssl, &hash_alg, &psk, &psk_len );
     }
@@ -1157,7 +1165,7 @@
 #if defined(MBEDTLS_SSL_EARLY_DATA)
     if( mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) &&
         ( mbedtls_ssl_conf_has_static_psk( ssl->conf ) == 1 ||
-          mbedtls_ssl_tls13_has_configured_ticket( ssl ) ) &&
+          ssl_tls13_has_configured_ticket( ssl ) ) &&
         ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED )
     {
         ret = mbedtls_ssl_tls13_write_early_data_ext( ssl, p, end, &ext_len );