AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-org binders writer

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-09-30 11:08:57 +08:00
parent f75364bee1
commit 6183cc7470
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
library/ssl_tls13_client.c
View File

@ -838,36 +838,20 @@ static int ssl_tls13_write_binder( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
unsigned char *end, unsigned char *end,
int psk_type, int psk_type,
psa_algorithm_t hash_alg,
const unsigned char *psk,
size_t psk_len,
size_t *out_len ) size_t *out_len )
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char *p = buf; unsigned char *p = buf;
const unsigned char *psk;
psa_algorithm_t psa_alg = PSA_ALG_NONE;
size_t psk_len;
unsigned char binder_len; unsigned char binder_len;
unsigned char transcript[MBEDTLS_MD_MAX_SIZE]; unsigned char transcript[MBEDTLS_MD_MAX_SIZE];
size_t transcript_len = 0; size_t transcript_len = 0;
*out_len = 0; *out_len = 0;
switch( psk_type ) binder_len = PSA_HASH_LENGTH( hash_alg );
{
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_HAVE_TIME)
case MBEDTLS_SSL_TLS1_3_PSK_RESUMPTION:
if( ssl_tls13_ticket_get_psk( ssl, &psa_alg, &psk, &psk_len ) != 0 )
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
break;
#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_HAVE_TIME*/
case MBEDTLS_SSL_TLS1_3_PSK_EXTERNAL:
if( ssl_tls13_psk_get_psk( ssl, &psa_alg, &psk, &psk_len ) != 0 )
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
break;
default:
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
}
binder_len = PSA_HASH_LENGTH( psa_alg );
if( binder_len == 0 ) if( binder_len == 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 3, ( "should never happen" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "should never happen" ) );
@ -884,14 +868,12 @@ static int ssl_tls13_write_binder( mbedtls_ssl_context *ssl,
/* Get current state of handshake transcript. */ /* Get current state of handshake transcript. */
ret = mbedtls_ssl_get_handshake_transcript( ret = mbedtls_ssl_get_handshake_transcript(
ssl, mbedtls_hash_info_md_from_psa( psa_alg ), ssl, mbedtls_hash_info_md_from_psa( hash_alg ),
transcript, MBEDTLS_MD_MAX_SIZE, &transcript_len ); transcript, MBEDTLS_MD_MAX_SIZE, &transcript_len );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
ret = mbedtls_ssl_tls13_create_psk_binder( ssl, hash_alg,
ret = mbedtls_ssl_tls13_create_psk_binder( ssl, psa_alg,
psk, psk_len, psk_type, psk, psk_len, psk_type,
transcript, p + 1 ); transcript, p + 1 );
if( ret != 0 ) if( ret != 0 )
@ -1043,6 +1025,10 @@ int mbedtls_ssl_tls13_write_binders_of_pre_shared_key_ext(
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char *p = buf; unsigned char *p = buf;
psa_algorithm_t hash_alg = PSA_ALG_NONE;
const unsigned char *psk;
size_t psk_len;
size_t output_len;
/* Check if we have space to write binders_len. /* Check if we have space to write binders_len.
* - binders_len (2 bytes) * - binders_len (2 bytes)
@ -1050,22 +1036,26 @@ int mbedtls_ssl_tls13_write_binders_of_pre_shared_key_ext(
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
p += 2; p += 2;
if( ssl_tls13_has_configured_ticket( ssl ) ) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
if( ssl_tls13_ticket_get_psk( ssl, &hash_alg, &psk, &psk_len ) == 0 )
{ {
size_t output_len;
ret = ssl_tls13_write_binder( ssl, p, end, ret = ssl_tls13_write_binder( ssl, p, end,
MBEDTLS_SSL_TLS1_3_PSK_RESUMPTION, MBEDTLS_SSL_TLS1_3_PSK_RESUMPTION,
hash_alg, psk, psk_len,
&output_len ); &output_len );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
p += output_len; p += output_len;
} }
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
if( ssl_tls13_has_configured_psk( ssl ) ) if( ssl_tls13_psk_get_psk( ssl, &hash_alg, &psk, &psk_len ) == 0 )
{ {
size_t output_len;
ret = ssl_tls13_write_binder( ssl, p, end, ret = ssl_tls13_write_binder( ssl, p, end,
MBEDTLS_SSL_TLS1_3_PSK_EXTERNAL, MBEDTLS_SSL_TLS1_3_PSK_EXTERNAL,
hash_alg, psk, psk_len,
&output_len ); &output_len );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );