yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-24 08:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

psa: slot mgmt: Improve psa_search_key_in_slots implementation

Browse source 
In case of a volatile key identifier, no need to check first
the validity of the key identifier, a volatile key identifier
is valid.

Move to a forward search for non-volatile key identifiers as
now key slots with small index are allocated first by
psa_get_empty_key_slot().

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2020-11-12 10:07:21 +01:00
parent 7d54f661d3
commit f473d8b44b
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
library/psa_crypto_slot_management.c
View file

@ -109,34 +109,31 @@ psa_status_t psa_validate_key_id(
static psa_status_t psa_search_key_in_slots( static psa_status_t psa_search_key_in_slots(
mbedtls_svc_key_id_t key, psa_key_slot_t **p_slot ) mbedtls_svc_key_id_t key, psa_key_slot_t **p_slot )
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_id_t key_id = MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key ); psa_key_id_t key_id = MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key );
size_t slot_idx;
psa_key_slot_t *slot = NULL; psa_key_slot_t *slot = NULL;
psa_status_t status = psa_validate_key_id( key, 1, 1 );
if( status != PSA_SUCCESS )
return( status );
if( psa_key_id_is_volatile( key_id ) ) if( psa_key_id_is_volatile( key_id ) )
{ {
slot = &global_data.key_slots[ key_id - PSA_KEY_ID_VOLATILE_MIN ]; slot = &global_data.key_slots[ key_id - PSA_KEY_ID_VOLATILE_MIN ];
status = mbedtls_svc_key_id_equal( key, slot->attr.id ) ?
if( ! mbedtls_svc_key_id_equal( key, slot->attr.id ) ) PSA_SUCCESS : PSA_ERROR_DOES_NOT_EXIST;
status = PSA_ERROR_DOES_NOT_EXIST;
} }
else else
{ {
status = PSA_ERROR_DOES_NOT_EXIST; status = psa_validate_key_id( key, 1, 1 );
slot = &global_data.key_slots[ PSA_KEY_SLOT_COUNT ]; if( status != PSA_SUCCESS )
return( status );
while( slot > &global_data.key_slots[ 0 ] ) for( slot_idx = 0; slot_idx < PSA_KEY_SLOT_COUNT; slot_idx++ )
{ {
slot--; slot = &global_data.key_slots[ slot_idx ];
if( mbedtls_svc_key_id_equal( key, slot->attr.id ) ) if( mbedtls_svc_key_id_equal( key, slot->attr.id ) )
{
status = PSA_SUCCESS;
break; break;
} }
} status = ( slot_idx < PSA_KEY_SLOT_COUNT ) ?
PSA_SUCCESS : PSA_ERROR_DOES_NOT_EXIST;
} }
if( status == PSA_SUCCESS ) if( status == PSA_SUCCESS )