From 9b84ea75de516cbce33d662b7c0a6d19027a1c76 Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Mon, 16 Jan 2023 14:08:23 +0800 Subject: [PATCH] remove ssl_tls13_has_compat_ticket_flags This content of the function is moved to ssl_tls13_has_configured_ticket. Signed-off-by: Pengyu Lv --- library/ssl_tls13_client.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index cda1a51508..4aea61ca74 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -672,22 +672,14 @@ static psa_algorithm_t ssl_tls13_get_ciphersuite_hash_alg(int ciphersuite) } #if defined(MBEDTLS_SSL_SESSION_TICKETS) -static int ssl_tls13_has_compat_ticket_flags(mbedtls_ssl_context *ssl) -{ - mbedtls_ssl_session *session = ssl->session_negotiate; - return session != NULL && - mbedtls_ssl_conf_tls13_check_kex_modes(ssl, - mbedtls_ssl_session_get_ticket_flags( - session, - MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL)); -} - 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 && - ssl_tls13_has_compat_ticket_flags(ssl); + mbedtls_ssl_conf_tls13_check_kex_modes( + ssl, mbedtls_ssl_session_get_ticket_flags( + session, MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL)); } #if defined(MBEDTLS_SSL_EARLY_DATA)