yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 22:25:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

psa: Use psa_status_t in psa_key_agreement_ecdh()

Browse Source 
Use the PSA-native status type in psa_key_agreement_ecdh() in
preparation for us calling PSA functions (and not just Mbed TLS
functions) and still being able to return a psa_status_t (without having
to translate it to a Mbed TLS error and then back again).
This commit is contained in:
Jaeden Amero 2019-01-10 19:38:51 +00:00 committed by Jaeden Amero
parent 6b19600fba
commit 1e5c2bd8e3
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/psa_crypto.c
View File

@ -4044,12 +4044,13 @@ static psa_status_t psa_key_agreement_ecdh( const uint8_t *peer_key,
mbedtls_pk_context pk; mbedtls_pk_context pk;
mbedtls_ecp_keypair *their_key = NULL; mbedtls_ecp_keypair *their_key = NULL;
mbedtls_ecdh_context ecdh; mbedtls_ecdh_context ecdh;
int ret; psa_status_t status;
mbedtls_ecdh_init( &ecdh ); mbedtls_ecdh_init( &ecdh );
mbedtls_pk_init( &pk ); mbedtls_pk_init( &pk );
ret = mbedtls_pk_parse_public_key( &pk, peer_key, peer_key_length ); status = mbedtls_to_psa_error(
if( ret != 0 ) mbedtls_pk_parse_public_key( &pk, peer_key, peer_key_length ) );
if( status != PSA_SUCCESS )
goto exit; goto exit;
switch( mbedtls_pk_get_type( &pk ) ) switch( mbedtls_pk_get_type( &pk ) )
{ {
@ -4057,33 +4058,36 @@ static psa_status_t psa_key_agreement_ecdh( const uint8_t *peer_key,
case MBEDTLS_PK_ECKEY_DH: case MBEDTLS_PK_ECKEY_DH:
break; break;
default: default:
ret = MBEDTLS_ERR_ECP_INVALID_KEY; status = PSA_ERROR_INVALID_ARGUMENT;
goto exit; goto exit;
} }
their_key = mbedtls_pk_ec( pk ); their_key = mbedtls_pk_ec( pk );
if( their_key->grp.id != our_key->grp.id ) if( their_key->grp.id != our_key->grp.id )
{ {
ret = MBEDTLS_ERR_ECP_INVALID_KEY; status = PSA_ERROR_INVALID_ARGUMENT;
goto exit; goto exit;
} }
ret = mbedtls_ecdh_get_params( &ecdh, their_key, MBEDTLS_ECDH_THEIRS ); status = mbedtls_to_psa_error(
if( ret != 0 ) mbedtls_ecdh_get_params( &ecdh, their_key, MBEDTLS_ECDH_THEIRS ) );
if( status != PSA_SUCCESS )
goto exit; goto exit;
ret = mbedtls_ecdh_get_params( &ecdh, our_key, MBEDTLS_ECDH_OURS ); status = mbedtls_to_psa_error(
if( ret != 0 ) mbedtls_ecdh_get_params( &ecdh, our_key, MBEDTLS_ECDH_OURS ) );
if( status != PSA_SUCCESS )
goto exit; goto exit;
ret = mbedtls_ecdh_calc_secret( &ecdh, status = mbedtls_to_psa_error(
shared_secret_length, mbedtls_ecdh_calc_secret( &ecdh,
shared_secret, shared_secret_size, shared_secret_length,
mbedtls_ctr_drbg_random, shared_secret, shared_secret_size,
&global_data.ctr_drbg ); mbedtls_ctr_drbg_random,
&global_data.ctr_drbg ) );
exit: exit:
mbedtls_pk_free( &pk ); mbedtls_pk_free( &pk );
mbedtls_ecdh_free( &ecdh ); mbedtls_ecdh_free( &ecdh );
return( mbedtls_to_psa_error( ret ) ); return( status );
} }
#endif /* MBEDTLS_ECDH_C */ #endif /* MBEDTLS_ECDH_C */