yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-31 18:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update psa_import_key to PSA 1.0

Browse source
This commit is contained in:
Janos Follath 2019-07-30 13:51:41 +01:00
parent bd096101b5
commit ed73b04c6e
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
library/ssl_tls.c
View file

@ -630,7 +630,7 @@ static int tls_prf_generic( mbedtls_md_type_t md_type,
{ {
psa_status_t status; psa_status_t status;
psa_algorithm_t alg; psa_algorithm_t alg;
psa_key_policy_t policy; psa_key_attributes_t attributes;
psa_key_handle_t master_slot; psa_key_handle_t master_slot;
psa_key_derivation_operation_t generator = psa_key_derivation_operation_t generator =
PSA_KEY_DERIVATION_OPERATION_INIT; PSA_KEY_DERIVATION_OPERATION_INIT;
@ -643,15 +643,12 @@ static int tls_prf_generic( mbedtls_md_type_t md_type,
else else
alg = PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256); alg = PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256);
policy = psa_key_policy_init(); attributes = psa_key_attributes_init();
psa_key_policy_set_usage( &policy, psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_DERIVE );
PSA_KEY_USAGE_DERIVE, psa_set_key_algorithm( &attributes, alg );
alg ); psa_set_key_type( &attributes, PSA_KEY_TYPE_DERIVE );
status = psa_set_key_policy( master_slot, &policy );
if( status != PSA_SUCCESS )
return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
status = psa_import_key( master_slot, PSA_KEY_TYPE_DERIVE, secret, slen ); status = psa_import_key( &attributes, secret, slen, &master_slot );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED ); return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );