Add client finished

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-04-16 16:52:57 +08:00
parent 27bdc7c6b6
commit ff2269889d
4 changed files with 50 additions and 2 deletions

View File

@ -1182,6 +1182,23 @@ cleanup:
static int ssl_tls13_postprocess_finished_message( mbedtls_ssl_context *ssl ) static int ssl_tls13_postprocess_finished_message( mbedtls_ssl_context *ssl )
{ {
#if defined(MBEDTLS_SSL_SRV_C)
int ret;
if( ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER )
{
/* Compute resumption_master_secret */
ret = mbedtls_ssl_tls13_generate_resumption_master_secret( ssl );
if( ret != 0 )
{
MBEDTLS_SSL_DEBUG_RET( 1,
"mbedtls_ssl_tls13_generate_resumption_master_secret ", ret );
return( ret );
}
return( 0 );
}
#endif /* MBEDTLS_SSL_SRV_C */
#if defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_CLI_C)
if( ssl->conf->endpoint == MBEDTLS_SSL_IS_CLIENT ) if( ssl->conf->endpoint == MBEDTLS_SSL_IS_CLIENT )
{ {

View File

@ -1565,4 +1565,13 @@ cleanup:
return( ret ); return( ret );
} }
int mbedtls_ssl_tls13_generate_resumption_master_secret(
mbedtls_ssl_context *ssl )
{
/* Erase master secrets */
mbedtls_platform_zeroize( &ssl->handshake->tls13_master_secrets,
sizeof( ssl->handshake->tls13_master_secrets ) );
return( 0 );
}
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */

View File

@ -610,6 +610,19 @@ int mbedtls_ssl_tls13_key_schedule_stage_application( mbedtls_ssl_context *ssl )
int mbedtls_ssl_tls13_generate_application_keys( int mbedtls_ssl_tls13_generate_application_keys(
mbedtls_ssl_context* ssl, mbedtls_ssl_key_set *traffic_keys ); mbedtls_ssl_context* ssl, mbedtls_ssl_key_set *traffic_keys );
/**
* \brief Compute TLS 1.3 resumption master secret.
*
* \param ssl The SSL context to operate on. This must be in
* key schedule stage \c Application, see
* mbedtls_ssl_tls13_key_schedule_stage_application().
*
* \returns \c 0 on success.
* \returns A negative error code on failure.
*/
int mbedtls_ssl_tls13_generate_resumption_master_secret(
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
* Finished message. * Finished message.

View File

@ -1496,8 +1496,17 @@ int ssl_tls13_write_server_finished( mbedtls_ssl_context *ssl )
*/ */
int ssl_tls13_process_client_finished( mbedtls_ssl_context *ssl ) int ssl_tls13_process_client_finished( mbedtls_ssl_context *ssl )
{ {
((void) ssl); int ret;
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ); MBEDTLS_SSL_DEBUG_MSG( 1,
( "Switch to handshake traffic keys for outbound traffic" ) );
mbedtls_ssl_set_inbound_transform( ssl, ssl->handshake->transform_handshake );
ret = mbedtls_ssl_tls13_process_finished_message( ssl );
if( ret != 0 )
return( ret );
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS );
return( 0 );
} }
/* /*