From 466dda855356443a1225652df5d1ffad069c6bbf Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Tue, 13 Sep 2022 11:20:20 +0800 Subject: [PATCH] Rename resumption master secret compute function Signed-off-by: Jerry Yu --- library/ssl_tls13_client.c | 4 ++-- library/ssl_tls13_keys.c | 7 +++---- library/ssl_tls13_keys.h | 3 +-- library/ssl_tls13_server.c | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index c3ee44d0b4..e92a10c0ae 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -2318,11 +2318,11 @@ static int ssl_tls13_write_client_finished( mbedtls_ssl_context *ssl ) if( ret != 0 ) return( ret ); - ret = mbedtls_ssl_tls13_generate_resumption_master_secret( ssl ); + ret = mbedtls_ssl_tls13_compute_resumption_master_secret( ssl ); if( ret != 0 ) { MBEDTLS_SSL_DEBUG_RET( 1, - "mbedtls_ssl_tls13_generate_resumption_master_secret ", ret ); + "mbedtls_ssl_tls13_compute_resumption_master_secret ", ret ); return ( ret ); } diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c index d0809fc1c7..504d897895 100644 --- a/library/ssl_tls13_keys.c +++ b/library/ssl_tls13_keys.c @@ -1504,8 +1504,7 @@ cleanup: return( ret ); } -int mbedtls_ssl_tls13_generate_resumption_master_secret( - mbedtls_ssl_context *ssl ) +int mbedtls_ssl_tls13_compute_resumption_master_secret( mbedtls_ssl_context *ssl ) { int ret = 0; @@ -1515,7 +1514,7 @@ int mbedtls_ssl_tls13_generate_resumption_master_secret( size_t transcript_len; MBEDTLS_SSL_DEBUG_MSG( 2, - ( "=> mbedtls_ssl_tls13_generate_resumption_master_secret" ) ); + ( "=> mbedtls_ssl_tls13_compute_resumption_master_secret" ) ); md_type = ssl->handshake->ciphersuite_info->mac; @@ -1542,7 +1541,7 @@ int mbedtls_ssl_tls13_generate_resumption_master_secret( mbedtls_md_get_size( mbedtls_md_info_from_type( md_type ) ) ); MBEDTLS_SSL_DEBUG_MSG( 2, - ( "<= mbedtls_ssl_tls13_generate_resumption_master_secret" ) ); + ( "<= mbedtls_ssl_tls13_compute_resumption_master_secret" ) ); return( 0 ); } diff --git a/library/ssl_tls13_keys.h b/library/ssl_tls13_keys.h index b1155fb2a6..b80e02c979 100644 --- a/library/ssl_tls13_keys.h +++ b/library/ssl_tls13_keys.h @@ -636,8 +636,7 @@ int mbedtls_ssl_tls13_generate_application_keys( * \returns A negative error code on failure. */ MBEDTLS_CHECK_RETURN_CRITICAL -int mbedtls_ssl_tls13_generate_resumption_master_secret( - mbedtls_ssl_context *ssl ); +int mbedtls_ssl_tls13_compute_resumption_master_secret( mbedtls_ssl_context *ssl ); /** * \brief Calculate the verify_data value for the client or server TLS 1.3 diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c index 0818a8f186..080415202a 100644 --- a/library/ssl_tls13_server.c +++ b/library/ssl_tls13_server.c @@ -2564,11 +2564,11 @@ static int ssl_tls13_process_client_finished( mbedtls_ssl_context *ssl ) if( ret != 0 ) return( ret ); - ret = mbedtls_ssl_tls13_generate_resumption_master_secret( ssl ); + ret = mbedtls_ssl_tls13_compute_resumption_master_secret( ssl ); if( ret != 0 ) { MBEDTLS_SSL_DEBUG_RET( 1, - "mbedtls_ssl_tls13_generate_resumption_master_secret ", ret ); + "mbedtls_ssl_tls13_compute_resumption_master_secret", ret ); } mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_HANDSHAKE_WRAPUP );