ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-10 00:49:04 +08:00
Code Issues Releases Wiki Activity

Rename resumption master secret compute function

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-09-13 11:20:20 +08:00
parent 6cf85a4bb0
commit 466dda8553
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ssl_tls13_client.c
View File

@ -2318,11 +2318,11 @@ static int ssl_tls13_write_client_finished( mbedtls_ssl_context *ssl )
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
ret = mbedtls_ssl_tls13_generate_resumption_master_secret( ssl ); ret = mbedtls_ssl_tls13_compute_resumption_master_secret( ssl );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, MBEDTLS_SSL_DEBUG_RET( 1,
"mbedtls_ssl_tls13_generate_resumption_master_secret ", ret ); "mbedtls_ssl_tls13_compute_resumption_master_secret ", ret );
return ( ret ); return ( ret );
} }

7
library/ssl_tls13_keys.c
View File

@ -1504,8 +1504,7 @@ cleanup:
return( ret ); return( ret );
} }
int mbedtls_ssl_tls13_generate_resumption_master_secret( int mbedtls_ssl_tls13_compute_resumption_master_secret( mbedtls_ssl_context *ssl )
mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = 0;
@ -1515,7 +1514,7 @@ int mbedtls_ssl_tls13_generate_resumption_master_secret(
size_t transcript_len; size_t transcript_len;
MBEDTLS_SSL_DEBUG_MSG( 2, 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; 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_md_get_size( mbedtls_md_info_from_type( md_type ) ) );
MBEDTLS_SSL_DEBUG_MSG( 2, MBEDTLS_SSL_DEBUG_MSG( 2,
( "<= mbedtls_ssl_tls13_generate_resumption_master_secret" ) ); ( "<= mbedtls_ssl_tls13_compute_resumption_master_secret" ) );
return( 0 ); return( 0 );
} }

3
library/ssl_tls13_keys.h
View File

@ -636,8 +636,7 @@ int mbedtls_ssl_tls13_generate_application_keys(
* \returns A negative error code on failure. * \returns A negative error code on failure.
*/ */
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_tls13_generate_resumption_master_secret( int mbedtls_ssl_tls13_compute_resumption_master_secret( mbedtls_ssl_context *ssl );
mbedtls_ssl_context *ssl );
/** /**
* \brief Calculate the verify_data value for the client or server TLS 1.3 * \brief Calculate the verify_data value for the client or server TLS 1.3

4
library/ssl_tls13_server.c
View File

@ -2564,11 +2564,11 @@ static int ssl_tls13_process_client_finished( mbedtls_ssl_context *ssl )
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
ret = mbedtls_ssl_tls13_generate_resumption_master_secret( ssl ); ret = mbedtls_ssl_tls13_compute_resumption_master_secret( ssl );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, 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 ); mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_HANDSHAKE_WRAPUP );