yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

psa: mac: Split psa_mac_setup()

Browse source 
Split out of psa_mac_setup() the final checks on
the requested algorithm and the key attributes.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2021-06-17 16:33:22 +02:00
parent 28ea050cf4
commit 2dff3b2a18
1 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
library/psa_crypto.c
View file

@ -2240,33 +2240,13 @@ psa_status_t psa_mac_abort( psa_mac_operation_t *operation )
return( status ); return( status );
} }
static psa_status_t psa_mac_setup( psa_mac_operation_t *operation, static psa_status_t psa_mac_finalize_alg_and_key_validation(
mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
int is_sign ) const psa_key_attributes_t *attributes )
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_slot_t *slot;
uint8_t mac_size; uint8_t mac_size;
/* A context must be freshly initialized before it can be set up. */
if( operation->id != 0 )
return( PSA_ERROR_BAD_STATE );
status = psa_get_and_lock_key_slot_with_policy(
key,
&slot,
is_sign ? PSA_KEY_USAGE_SIGN_HASH : PSA_KEY_USAGE_VERIFY_HASH,
alg );
if( status != PSA_SUCCESS )
return( status );
psa_key_attributes_t key_attributes = {
.core = slot->attr
};
psa_key_attributes_t *attributes = &key_attributes;
if( ! PSA_ALG_IS_MAC( alg ) ) if( ! PSA_ALG_IS_MAC( alg ) )
{ {
status = PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_INVALID_ARGUMENT;
@ -2303,14 +2283,50 @@ static psa_status_t psa_mac_setup( psa_mac_operation_t *operation,
goto exit; goto exit;
} }
operation->is_sign = is_sign; status = PSA_SUCCESS;
operation->mac_size = mac_size;
exit:
return( status );
}
static psa_status_t psa_mac_setup( psa_mac_operation_t *operation,
mbedtls_svc_key_id_t key,
psa_algorithm_t alg,
int is_sign )
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_slot_t *slot;
/* A context must be freshly initialized before it can be set up. */
if( operation->id != 0 )
return( PSA_ERROR_BAD_STATE );
status = psa_get_and_lock_key_slot_with_policy(
key,
&slot,
is_sign ? PSA_KEY_USAGE_SIGN_HASH : PSA_KEY_USAGE_VERIFY_HASH,
alg );
if( status != PSA_SUCCESS )
return( status );
psa_key_attributes_t attributes = {
.core = slot->attr
};
status = psa_mac_finalize_alg_and_key_validation( alg, &attributes );
if( status != PSA_SUCCESS )
goto exit;
operation->is_sign = is_sign;
operation->mac_size = PSA_MAC_LENGTH( psa_get_key_type( &attributes ),
psa_get_key_bits( &attributes ),
alg );
/* Dispatch the MAC setup call with validated input */ /* Dispatch the MAC setup call with validated input */
if( is_sign ) if( is_sign )
{ {
status = psa_driver_wrapper_mac_sign_setup( operation, status = psa_driver_wrapper_mac_sign_setup( operation,
&key_attributes, &attributes,
slot->key.data, slot->key.data,
slot->key.bytes, slot->key.bytes,
alg ); alg );
@ -2318,7 +2334,7 @@ static psa_status_t psa_mac_setup( psa_mac_operation_t *operation,
else else
{ {
status = psa_driver_wrapper_mac_verify_setup( operation, status = psa_driver_wrapper_mac_verify_setup( operation,
&key_attributes, &attributes,
slot->key.data, slot->key.data,
slot->key.bytes, slot->key.bytes,
alg ); alg );