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

Refactor key_schedule_stage_handshake

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-10-11 17:47:07 +08:00
parent 5ccfcd4ca1
commit f0ac2352d6
3 changed files with 41 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_tls13_client.c
View File

@ -1297,7 +1297,7 @@ static int ssl_tls1_3_finalize_server_hello( mbedtls_ssl_context *ssl )
} }
/* Compute handshake secret */ /* Compute handshake secret */
ret = mbedtls_ssl_tls1_3_key_schedule_stage_handshake( ssl ); ret = mbedtls_ssl_tls13_key_schedule_stage_handshake( ssl );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_tls1_3_derive_master_secret", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_tls1_3_derive_master_secret", ret );

98
library/ssl_tls13_keys.c
View File

@ -964,83 +964,57 @@ exit:
return( ret ); return( ret );
} }
static int ssl_tls1_3_complete_ephemeral_secret( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_key_schedule_stage_handshake( mbedtls_ssl_context *ssl )
unsigned char *secret,
size_t secret_len,
unsigned char **actual_secret,
size_t *actual_len )
{ {
int ret = 0; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
*actual_secret = NULL;
*actual_len = 0;
/*
* Compute ECDHE secret for second stage of secret evolution.
*/
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDHE_ENABLED)
if( mbedtls_ssl_tls1_3_some_ephemeral_enabled( ssl ) )
{
if( mbedtls_ssl_tls13_named_group_is_ecdhe(
ssl->handshake->offered_group_id ) )
{
#if defined(MBEDTLS_ECDH_C)
ret = mbedtls_ecdh_calc_secret( &ssl->handshake->ecdh_ctx,
actual_len, secret, secret_len,
ssl->conf->f_rng,
ssl->conf->p_rng );
if( ret != 0 )
{
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecdh_calc_secret", ret );
return( ret );
}
*actual_secret = secret;
#endif /* MBEDTLS_ECDH_C */
}
else if( mbedtls_ssl_tls13_named_group_is_dhe(
ssl->handshake->offered_group_id ) )
{
/* TODO: Not supported yet */
}
}
#else
((void) ssl);
((void) secret);
((void) secret_len);
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_ECDHE_ENABLED */
return( ret );
}
int mbedtls_ssl_tls1_3_key_schedule_stage_handshake( mbedtls_ssl_context *ssl )
{
int ret = 0;
mbedtls_ssl_handshake_params *handshake = ssl->handshake; mbedtls_ssl_handshake_params *handshake = ssl->handshake;
mbedtls_md_type_t const md_type = handshake->ciphersuite_info->mac; mbedtls_md_type_t const md_type = handshake->ciphersuite_info->mac;
size_t ephemeral_len = 0;
unsigned char ecdhe[MBEDTLS_ECP_MAX_BYTES];
#if defined(MBEDTLS_DEBUG_C) #if defined(MBEDTLS_DEBUG_C)
mbedtls_md_info_t const * const md_info = mbedtls_md_info_from_type( md_type ); mbedtls_md_info_t const * const md_info = mbedtls_md_info_from_type( md_type );
size_t const md_size = mbedtls_md_get_size( md_info ); size_t const md_size = mbedtls_md_get_size( md_info );
#endif /* MBEDTLS_DEBUG_C */ #endif /* MBEDTLS_DEBUG_C */
unsigned char *ephemeral; #if defined(MBEDTLS_KEY_EXCHANGE_SOME_ECDHE_ENABLED)
size_t ephemeral_len; /*
* Compute ECDHE secret used to compute the handshake secret from which
unsigned char ecdhe[66]; /* TODO: Magic constant! */ * client_handshake_traffic_secret and server_handshake_traffic_secret
* are derived in the handshake secret derivation stage.
/* Finalize calculation of ephemeral input to key schedule, if present. */ */
ret = ssl_tls1_3_complete_ephemeral_secret( ssl, ecdhe, sizeof( ecdhe ), if( mbedtls_ssl_tls1_3_ephemeral_enabled( ssl ) )
&ephemeral, &ephemeral_len ); {
if( mbedtls_ssl_tls13_named_group_is_ecdhe( handshake->offered_group_id ) )
{
#if defined(MBEDTLS_ECDH_C)
ret = mbedtls_ecdh_calc_secret( &handshake->ecdh_ctx,
&ephemeral_len, ecdhe, sizeof( ecdhe ),
ssl->conf->f_rng,
ssl->conf->p_rng );
if( ret != 0 ) if( ret != 0 )
{
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecdh_calc_secret", ret );
return( ret ); return( ret );
}
#endif /* MBEDTLS_ECDH_C */
}
else if( mbedtls_ssl_tls13_named_group_is_dhe( handshake->offered_group_id ) )
{
/* TODO: Not supported yet */
MBEDTLS_SSL_DEBUG_MSG( 1, ( "DHE not supported." ) );
return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
}
}
#else
return( MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE );
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_ECDHE_ENABLED */
/* /*
* Compute HandshakeSecret * Compute the Handshake Secret
*/ */
ret = mbedtls_ssl_tls1_3_evolve_secret( md_type, ret = mbedtls_ssl_tls1_3_evolve_secret( md_type,
handshake->tls1_3_master_secrets.early, handshake->tls1_3_master_secrets.early,
ephemeral, ephemeral_len, ecdhe, ephemeral_len,
handshake->tls1_3_master_secrets.handshake ); handshake->tls1_3_master_secrets.handshake );
if( ret != 0 ) if( ret != 0 )
{ {

4
library/ssl_tls13_keys.h
View File

@ -548,14 +548,14 @@ int mbedtls_ssl_tls1_3_key_schedule_stage_early( mbedtls_ssl_context *ssl );
* \returns \c 0 on success. * \returns \c 0 on success.
* \returns A negative error code on failure. * \returns A negative error code on failure.
*/ */
int mbedtls_ssl_tls1_3_key_schedule_stage_handshake( mbedtls_ssl_context *ssl ); int mbedtls_ssl_tls13_key_schedule_stage_handshake( mbedtls_ssl_context *ssl );
/** /**
* \brief Compute TLS 1.3 handshake traffic keys. * \brief Compute TLS 1.3 handshake traffic keys.
* *
* \param ssl The SSL context to operate on. This must be in * \param ssl The SSL context to operate on. This must be in
* key schedule stage \c Handshake, see * key schedule stage \c Handshake, see
* mbedtls_ssl_tls1_3_key_schedule_stage_handshake(). * mbedtls_ssl_tls13_key_schedule_stage_handshake().
* \param traffic_keys The address at which to store the handshake traffic key * \param traffic_keys The address at which to store the handshake traffic key
* keys. This must be writable but may be uninitialized. * keys. This must be writable but may be uninitialized.
* *