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

Handle empty other secret when passed with input bytes

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2022-04-12 12:08:01 +02:00
parent cd00d7f724
commit 2503f7e4cb
1 changed files with 9 additions and 2 deletions

11
library/psa_crypto.c

@ -5243,6 +5243,10 @@ static psa_status_t psa_tls12_prf_set_other_key( psa_tls12_prf_key_derivation_t
memcpy( prf->other_secret, data, data_length ); memcpy( prf->other_secret, data, data_length );
prf->other_secret_length = data_length; prf->other_secret_length = data_length;
} }
else
{
prf->other_secret_length = 0;
}
prf->state = PSA_TLS12_PRF_STATE_OTHER_KEY_SET; prf->state = PSA_TLS12_PRF_STATE_OTHER_KEY_SET;
@ -5332,8 +5336,11 @@ static psa_status_t psa_tls12_prf_psk_to_ms_set_key(
{ {
*cur++ = MBEDTLS_BYTE_1( prf->other_secret_length ); *cur++ = MBEDTLS_BYTE_1( prf->other_secret_length );
*cur++ = MBEDTLS_BYTE_0( prf->other_secret_length ); *cur++ = MBEDTLS_BYTE_0( prf->other_secret_length );
memcpy( cur, prf->other_secret, prf->other_secret_length ); if ( prf->other_secret_length != 0 )
cur += prf->other_secret_length; {
memcpy( cur, prf->other_secret, prf->other_secret_length );
cur += prf->other_secret_length;
}
} }
else else
{ {