AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix:4162 Return correct error type for invalid key

Browse Source 
Return PSA_ERROR_INVALID_HANDLE instead of
PSA_ERROR_DOES_NOT_EXIST if invalid key is passed for some key
operations.

Signed-off-by: Maulik  Patel <Maulik.Patel@arm.com>
This commit is contained in:
Maulik Patel 2021-03-15 14:48:14 +00:00
parent e483a77c85
commit c1bfcdda58
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/psa_crypto_slot_management.c
View File

@ -305,13 +305,15 @@ psa_status_t psa_get_and_lock_key_slot( mbedtls_svc_key_id_t key,
status = psa_load_persistent_key_into_slot( *p_slot ); status = psa_load_persistent_key_into_slot( *p_slot );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
{
psa_wipe_key_slot( *p_slot ); psa_wipe_key_slot( *p_slot );
if( status == PSA_ERROR_DOES_NOT_EXIST )
status = PSA_ERROR_INVALID_HANDLE;
}
return( status ); return( status );
#else #else
return( PSA_ERROR_DOES_NOT_EXIST ); return( PSA_ERROR_INVALID_HANDLE );
#endif /* defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */ #endif /* defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */
} }
psa_status_t psa_unlock_key_slot( psa_key_slot_t *slot ) psa_status_t psa_unlock_key_slot( psa_key_slot_t *slot )
@ -399,6 +401,9 @@ psa_status_t psa_open_key( mbedtls_svc_key_id_t key, psa_key_handle_t *handle )
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
{ {
*handle = PSA_KEY_HANDLE_INIT; *handle = PSA_KEY_HANDLE_INIT;
if( status == PSA_ERROR_INVALID_HANDLE )
status = PSA_ERROR_DOES_NOT_EXIST;
return( status ); return( status );
} }
@ -423,8 +428,12 @@ psa_status_t psa_close_key( psa_key_handle_t handle )
status = psa_get_and_lock_key_slot_in_memory( handle, &slot ); status = psa_get_and_lock_key_slot_in_memory( handle, &slot );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); {
if( status == PSA_ERROR_DOES_NOT_EXIST )
status = PSA_ERROR_INVALID_HANDLE;
return( status );
}
if( slot->lock_count <= 1 ) if( slot->lock_count <= 1 )
return( psa_wipe_key_slot( slot ) ); return( psa_wipe_key_slot( slot ) );
else else