mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-24 15:02:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ssl_tls13_has_configured_ticket() back to tls13 client

Browse Source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian 2022-11-01 07:39:46 +00:00
parent 893ad81966
commit b781a2323c
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/ssl_misc.h
View File

@ -1487,11 +1487,6 @@ int mbedtls_ssl_psk_derive_premaster( mbedtls_ssl_context *ssl,
#endif /* !MBEDTLS_USE_PSA_CRYPTO */ #endif /* !MBEDTLS_USE_PSA_CRYPTO */
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */ #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_HANDSHAKE_WITH_PSK_ENABLED)
#if defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_CLI_C)
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL

9
library/ssl_tls.c
View File

@ -1872,15 +1872,6 @@ int mbedtls_ssl_set_hs_ecjpake_password( mbedtls_ssl_context *ssl,
} }
#endif /* MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED */ #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) #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED)
int mbedtls_ssl_conf_has_static_psk( mbedtls_ssl_config const *conf ) int mbedtls_ssl_conf_has_static_psk( mbedtls_ssl_config const *conf )
{ {

18
library/ssl_tls13_client.c
View File

@ -693,6 +693,14 @@ static psa_algorithm_t ssl_tls13_get_ciphersuite_hash_alg( int ciphersuite )
} }
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #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 MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_tls13_ticket_get_identity( mbedtls_ssl_context *ssl, static int ssl_tls13_ticket_get_identity( mbedtls_ssl_context *ssl,
psa_algorithm_t *hash_alg, psa_algorithm_t *hash_alg,
@ -701,7 +709,7 @@ static int ssl_tls13_ticket_get_identity( mbedtls_ssl_context *ssl,
{ {
mbedtls_ssl_session *session = ssl->session_negotiate; mbedtls_ssl_session *session = ssl->session_negotiate;
if( !mbedtls_ssl_tls13_has_configured_ticket( ssl ) ) if( !ssl_tls13_has_configured_ticket( ssl ) )
return( -1 ); return( -1 );
*hash_alg = ssl_tls13_get_ciphersuite_hash_alg( session->ciphersuite ); *hash_alg = ssl_tls13_get_ciphersuite_hash_alg( session->ciphersuite );
@ -719,7 +727,7 @@ static int ssl_tls13_ticket_get_psk( mbedtls_ssl_context *ssl,
mbedtls_ssl_session *session = ssl->session_negotiate; mbedtls_ssl_session *session = ssl->session_negotiate;
if( !mbedtls_ssl_tls13_has_configured_ticket( ssl ) ) if( !ssl_tls13_has_configured_ticket( ssl ) )
return( -1 ); return( -1 );
*hash_alg = ssl_tls13_get_ciphersuite_hash_alg( session->ciphersuite ); *hash_alg = ssl_tls13_get_ciphersuite_hash_alg( session->ciphersuite );
@ -766,7 +774,7 @@ static int ssl_tls13_get_configured_psk_count( mbedtls_ssl_context *ssl )
{ {
int configured_psk_count = 0; int configured_psk_count = 0;
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #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" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "Ticket is configured" ) );
configured_psk_count++; configured_psk_count++;
@ -1087,7 +1095,7 @@ static int ssl_tls13_parse_server_pre_shared_key_ext( mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
if( selected_identity == 0 && 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 ); ret = ssl_tls13_ticket_get_psk( ssl, &hash_alg, &psk, &psk_len );
} }
@ -1157,7 +1165,7 @@ int mbedtls_ssl_tls13_write_client_hello_exts( mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
if( mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) && if( mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) &&
( mbedtls_ssl_conf_has_static_psk( ssl->conf ) == 1 || ( 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 ) ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED )
{ {
ret = mbedtls_ssl_tls13_write_early_data_ext( ssl, p, end, &ext_len ); ret = mbedtls_ssl_tls13_write_early_data_ext( ssl, p, end, &ext_len );