mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-28 19:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor hrr key_share

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-05-05 11:10:08 +08:00
parent 49ca92892d
commit b0ac10b4a8
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/ssl_tls13_server.c
View File

@ -945,8 +945,12 @@ static int ssl_tls13_write_hrr_key_share_ext( mbedtls_ssl_context *ssl,
*out_len = 0; *out_len = 0;
/* For a pure PSK-based ciphersuite there is no key share to declare. */ /*
if( ! mbedtls_ssl_conf_tls13_some_ephemeral_enabled( ssl ) ) * For a pure PSK key exchange, there is no group to agree upon. The purpose
* of the HRR is then to transmit a cookie to force the client to demonstrate
* reachability at their apparent network address (primarily useful for DTLS).
*/
if( ! mbedtls_ssl_tls13_some_ephemeral_enabled( ssl ) )
return( 0 ); return( 0 );
/* We should only send the key_share extension if the client's initial /* We should only send the key_share extension if the client's initial
@ -963,23 +967,15 @@ static int ssl_tls13_write_hrr_key_share_ext( mbedtls_ssl_context *ssl,
return( MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE ); return( MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE );
} }
if( ! mbedtls_ssl_named_group_is_offered( ssl, selected_group ) || /* Check if we have enough space:
! mbedtls_ssl_named_group_is_supported( selected_group ) ) * - extension_type (2 bytes)
{ * - extension_data_length (2 bytes)
MBEDTLS_SSL_DEBUG_MSG( 4, ( "should never happen" ) ); * - selected_group (2 bytes)
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); */
}
/* extension header, extension length, NamedGroup value */
MBEDTLS_SSL_CHK_BUF_READ_PTR( buf, end, 6 ); MBEDTLS_SSL_CHK_BUF_READ_PTR( buf, end, 6 );
/* Write extension header */
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_KEY_SHARE, buf, 0 ); MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_KEY_SHARE, buf, 0 );
/* Write extension length */
MBEDTLS_PUT_UINT16_BE( 2, buf, 2 ); MBEDTLS_PUT_UINT16_BE( 2, buf, 2 );
/* Write selected group */
MBEDTLS_PUT_UINT16_BE( selected_group, buf, 4 ); MBEDTLS_PUT_UINT16_BE( selected_group, buf, 4 );
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
@ -988,8 +984,8 @@ static int ssl_tls13_write_hrr_key_share_ext( mbedtls_ssl_context *ssl,
selected_group ) ); selected_group ) );
*out_len = 6; *out_len = 6;
return( 0 );
return( 0 );
} }
/* /*