mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-28 00:21:48 +03:00
Update code base on review comments
Refine named_group parsing Refine cipher_suites parsing Remove hrr related part Share code between client and server side Some code style changes Change-Id: Ia9ffd5ef9c0b64325f633241e0ea1669049fe33a Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
@ -586,6 +586,11 @@ struct mbedtls_ssl_handshake_params
|
||||
int hello_retry_request_count;
|
||||
#endif /* MBEDTLS_SSL_CLI_C */
|
||||
|
||||
#if defined(MBEDTLS_SSL_SRV_C)
|
||||
/*!< selected_group of key_share extension in HelloRetryRequest message. */
|
||||
uint16_t hrr_selected_group;
|
||||
#endif /* MBEDTLS_SSL_SRV_C */
|
||||
|
||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && \
|
||||
defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
|
||||
mbedtls_ssl_sig_hash_set_t hash_algs; /*!< Set of suitable sig-hash pairs */
|
||||
@ -1856,6 +1861,39 @@ static inline int mbedtls_ssl_tls13_named_group_is_dhe( uint16_t named_group )
|
||||
named_group <= MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE8192 );
|
||||
}
|
||||
|
||||
static inline int mbedtls_ssl_named_group_is_offered(
|
||||
const mbedtls_ssl_context *ssl, uint16_t named_group )
|
||||
{
|
||||
const uint16_t *group_list = mbedtls_ssl_get_groups( ssl );
|
||||
|
||||
if( group_list == NULL )
|
||||
return( 0 );
|
||||
|
||||
for( ; *group_list != 0; group_list++ )
|
||||
{
|
||||
if( *group_list == named_group )
|
||||
return( 1 );
|
||||
}
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
static inline int mbedtls_ssl_named_group_is_supported( uint16_t named_group )
|
||||
{
|
||||
#if defined(MBEDTLS_ECDH_C)
|
||||
if( mbedtls_ssl_tls13_named_group_is_ecdhe( named_group ) )
|
||||
{
|
||||
const mbedtls_ecp_curve_info *curve_info =
|
||||
mbedtls_ecp_curve_info_from_tls_id( named_group );
|
||||
if( curve_info != NULL )
|
||||
return( 1 );
|
||||
}
|
||||
#else
|
||||
((void) named_group);
|
||||
#endif /* MBEDTLS_ECDH_C */
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
/*
|
||||
* Return supported signature algorithms.
|
||||
*
|
||||
@ -2180,4 +2218,7 @@ int mbedtls_ssl_tls13_read_public_ecdhe_share( mbedtls_ssl_context *ssl,
|
||||
|
||||
#endif /* MBEDTLS_ECDH_C */
|
||||
|
||||
int mbedtls_ssl_tls13_cipher_suite_is_offered( mbedtls_ssl_context *ssl,
|
||||
int cipher_suite );
|
||||
|
||||
#endif /* ssl_misc.h */
|
||||
|
Reference in New Issue
Block a user