mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-16 08:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix various issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-09-15 18:41:02 +08:00
parent dd1fb9e37e
commit 388bd0d53c
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ecdh.c
View File

@ -788,7 +788,7 @@ int mbedtls_ecdh_tls13_make_params( mbedtls_ecdh_context *ctx, size_t *olen,
} }
/* /*
* Setup context without everst * Setup context without Everest
*/ */
int mbedtls_ecdh_setup_no_everest( mbedtls_ecdh_context *ctx, int mbedtls_ecdh_setup_no_everest( mbedtls_ecdh_context *ctx,
mbedtls_ecp_group_id grp_id ) mbedtls_ecp_group_id grp_id )

2
library/ecdh_misc.h
View File

@ -30,7 +30,7 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) #if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
/* /*
* Setup context without everst * Setup context without Everest
*/ */
int mbedtls_ecdh_setup_no_everest( mbedtls_ecdh_context *ctx, int mbedtls_ecdh_setup_no_everest( mbedtls_ecdh_context *ctx,
mbedtls_ecp_group_id grp_id ); mbedtls_ecp_group_id grp_id );

45
library/ssl_tls13_client.c
View File

@ -55,7 +55,7 @@ static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported versions extension" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported versions extension" ) );
/* Check if we have space for header and length fields: /* Check if we have space to write the extension:
* - extension_type (2 bytes) * - extension_type (2 bytes)
* - extension_data_length (2 bytes) * - extension_data_length (2 bytes)
* - versions_length (1 byte ) * - versions_length (1 byte )
@ -221,7 +221,7 @@ static int ssl_tls13_write_supported_groups_ext( mbedtls_ssl_context *ssl,
} }
p += output_len; p += output_len;
/* Both ECDHE and DHE Fail. */ /* Both ECDHE and DHE failed. */
if( ret_ecdhe != 0 && ret_dhe != 0 ) if( ret_ecdhe != 0 && ret_dhe != 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "Both ECDHE and DHE groups are fail. " ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "Both ECDHE and DHE groups are fail. " ) );
@ -232,7 +232,7 @@ static int ssl_tls13_write_supported_groups_ext( mbedtls_ssl_context *ssl,
named_group_list_len = p - named_group_list_ptr; named_group_list_len = p - named_group_list_ptr;
if( named_group_list_len == 0 ) if( named_group_list_len == 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "No group Available." ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "No group available." ) );
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
} }
@ -275,7 +275,7 @@ static int ssl_tls13_generate_and_write_ecdh_key_exchange(
if( ( ret = mbedtls_ecdh_setup_no_everest( &ssl->handshake->ecdh_ctx, if( ( ret = mbedtls_ecdh_setup_no_everest( &ssl->handshake->ecdh_ctx,
curve_info->grp_id ) ) != 0 ) curve_info->grp_id ) ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecp_group_load", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecdh_setup_no_everest", ret );
return( ret ); return( ret );
} }
@ -299,31 +299,20 @@ static int ssl_tls13_get_default_group_id( mbedtls_ssl_context *ssl,
{ {
int ret = MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE; int ret = MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
/* Pick first entry of curve list.
*
* TODO: When we introduce PQC KEMs, we'll have a NamedGroup
* list instead, and can just return its first element.
*/
/* Check if ecdhe named groups are available and pick first entry */
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_ECDH_C)
#if !defined(MBEDTLS_ECP_C) /* Pick first available ECDHE group compatible with TLS 1.3 */
((void) ssl); if( ssl->conf->curve_list == NULL )
#endif return( MBEDTLS_ERR_SSL_BAD_CONFIG );
#if defined(MBEDTLS_ECP_C)
for ( const mbedtls_ecp_group_id * grp_id = ssl->conf->curve_list; for ( const mbedtls_ecp_group_id *grp_id = ssl->conf->curve_list;
*grp_id != MBEDTLS_ECP_DP_NONE; *grp_id != MBEDTLS_ECP_DP_NONE;
grp_id++ ) grp_id++ )
{ {
const mbedtls_ecp_curve_info *info; const mbedtls_ecp_curve_info *info;
info = mbedtls_ecp_curve_info_from_grp_id( *grp_id ); info = mbedtls_ecp_curve_info_from_grp_id( *grp_id );
#else if( info != NULL &&
for ( const mbedtls_ecp_curve_info *info = mbedtls_ecp_curve_list(); mbedtls_ssl_tls13_named_group_is_ecdhe( info->tls_id ) )
info->grp_id != MBEDTLS_ECP_DP_NONE;
info++ )
{
#endif
if( info != NULL && mbedtls_ssl_tls13_named_group_is_ecdhe( info->tls_id ) )
{ {
*group_id = info->tls_id; *group_id = info->tls_id;
return( 0 ); return( 0 );
@ -336,7 +325,7 @@ static int ssl_tls13_get_default_group_id( mbedtls_ssl_context *ssl,
/* /*
* Add DHE named groups here. * Add DHE named groups here.
* Check if ecdhe named groups are available and pick first entry * Pick first available DHE group compatible with TLS 1.3
*/ */
return( ret ); return( ret );
@ -345,7 +334,7 @@ static int ssl_tls13_get_default_group_id( mbedtls_ssl_context *ssl,
/* /*
* ssl_tls13_write_key_share_ext * ssl_tls13_write_key_share_ext
* *
* Structure of key_share extension in ClientHelo: * Structure of key_share extension in ClientHello:
* *
* struct { * struct {
* NamedGroup group; * NamedGroup group;
@ -402,8 +391,8 @@ static int ssl_tls13_write_key_share_ext( mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_ECDH_C)
if( mbedtls_ssl_tls13_named_group_is_ecdhe( group_id ) ) if( mbedtls_ssl_tls13_named_group_is_ecdhe( group_id ) )
{ {
/* Pointer of group */ /* Pointer to group */
unsigned char *group_id_ptr = p; unsigned char *group_ptr = p;
/* Length of key_exchange */ /* Length of key_exchange */
size_t key_exchange_len; size_t key_exchange_len;
@ -421,9 +410,9 @@ static int ssl_tls13_write_key_share_ext( mbedtls_ssl_context *ssl,
return( ret ); return( ret );
/* Write group */ /* Write group */
MBEDTLS_PUT_UINT16_BE( group_id, group_id_ptr, 0 ); MBEDTLS_PUT_UINT16_BE( group_id, group_ptr, 0 );
/* Write key_exchange_length */ /* Write key_exchange_length */
MBEDTLS_PUT_UINT16_BE( key_exchange_len, group_id_ptr, 2 ); MBEDTLS_PUT_UINT16_BE( key_exchange_len, group_ptr, 2 );
} }
else else
#endif /* MBEDTLS_ECDH_C */ #endif /* MBEDTLS_ECDH_C */