lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

fix write key_share issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2022-04-20 21:50:42 +08:00
parent 637a3f1090
commit 57d4841eda
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/ssl_tls13_server.c
View File

@ -859,10 +859,9 @@ static int ssl_tls13_write_key_share_ext( mbedtls_ssl_context *ssl,
size_t *out_len ) size_t *out_len )
{ {
unsigned char *p = buf; unsigned char *p = buf;
unsigned char *start = buf; uint16_t group = ssl->handshake->offered_group_id;
uint16_t group = ssl->handshake->offered_group_id ;
unsigned char *server_share = buf + 4; unsigned char *server_share = buf + 4;
unsigned char *key_exchange = buf + 6; unsigned char *p_key_exchange_len = buf + 6;
size_t key_exchange_length; size_t key_exchange_length;
int ret; int ret;
@ -877,29 +876,22 @@ static int ssl_tls13_write_key_share_ext( mbedtls_ssl_context *ssl,
* - key_exchange_length (2 bytes) * - key_exchange_length (2 bytes)
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 8 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 8 );
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_KEY_SHARE, p, 0 );
MBEDTLS_PUT_UINT16_BE( group, server_share, 0 );
p += 8; p += 8;
/* When we introduce PQC-ECDHE hybrids, we'll want to call this /* When we introduce PQC-ECDHE hybrids, we'll want to call this
* function multiple times. */ * function multiple times. */
ret = ssl_tls13_key_share_encapsulate( ssl, group, key_exchange + 2, ret = ssl_tls13_key_share_encapsulate( ssl, group, p_key_exchange_len + 2,
end, &key_exchange_length ); end, &key_exchange_length );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
p += key_exchange_length; p += key_exchange_length;
/* Write length of key_exchange */ MBEDTLS_PUT_UINT16_BE( key_exchange_length, p_key_exchange_len, 0 );
MBEDTLS_PUT_UINT16_BE( key_exchange_length, key_exchange, 0 );
*out_len = p - start; MBEDTLS_PUT_UINT16_BE( p - server_share, buf, 2 );
/* Write group ID */
MBEDTLS_PUT_UINT16_BE( group, server_share, 0 );
/* Write extension header */
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_KEY_SHARE, start, 0 );
/* Write total extension length */
MBEDTLS_PUT_UINT16_BE( p - server_share, start, 2 );
*out_len = p - buf;
return( 0 ); return( 0 );
} }
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */ #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */