commit 7094f66879fdae230085435323c42c71fbd29287
author Xiaokang Qian <xiaokang.qian@arm.com> Mon Dec 19 07:35:40 2022 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Wed Feb 08 05:44:00 2023 +0000
tree 0eaf4a4073740b7d9965fab44c050e41a7f06253
parent 854db28bb7ebc4f69807cba4b044255a6cfd7a49

Remove useless duplicted mbedtls_ssl_tls13_ticket_get_psk

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 baef741..146dae0 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2629,13 +2629,6 @@
     return 0;
 }
 
-#ifdef MBEDTLS_SSL_SESSION_TICKETS
-int mbedtls_ssl_tls13_ticket_get_psk(mbedtls_ssl_context *ssl,
-                                     psa_algorithm_t *hash_alg,
-                                     const unsigned char **psk,
-                                     size_t *psk_len);
-#endif
-
 /**
  * \brief Validate cipher suite against config in SSL context.
  *

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 874f243..8615d90 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -975,7 +975,7 @@
         ret = ssl_tls13_ticket_get_psk(ssl, &hash_alg, &psk, &psk_len);
         if (ret != 0) {
             MBEDTLS_SSL_DEBUG_RET(
-                1, "mbedtls_ssl_tls13_ticket_get_psk", ret);
+                1, "ssl_tls13_ticket_get_psk", ret);
             return ret;
         }
 

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 3de164c..513937e 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1574,31 +1574,4 @@
     return MBEDTLS_ERR_SSL_UNSUPPORTED_EXTENSION;
 }
 
-#ifdef MBEDTLS_SSL_SESSION_TICKETS
-int mbedtls_ssl_tls13_ticket_get_psk(mbedtls_ssl_context *ssl,
-                                     psa_algorithm_t *hash_alg,
-                                     const unsigned char **psk,
-                                     size_t *psk_len)
-{
-
-    mbedtls_ssl_session *session = ssl->session_negotiate;
-    const mbedtls_ssl_ciphersuite_t *ciphersuite_info = NULL;
-
-    if (ssl->handshake->resume == 0 || session == NULL ||
-        session->ticket == NULL) {
-        return -1;
-    }
-
-    ciphersuite_info = mbedtls_ssl_ciphersuite_from_id(session->ciphersuite);
-    if (ciphersuite_info != NULL) {
-        *hash_alg = mbedtls_psa_translate_md(ciphersuite_info->mac);
-    }
-
-    *psk = session->resumption_key;
-    *psk_len = session->resumption_key_len;
-
-    return 0;
-}
-#endif /* MBEDTLS_SSL_SESSION_TICKETS */
-
 #endif /* MBEDTLS_SSL_TLS_C && MBEDTLS_SSL_PROTO_TLS1_3 */