lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Split persistence and key id validation

Browse Source 
With key usage based on key identifiers and not
key handles (openless APIs), volatile keys will
also have a key identifier. Thus, isolate key
identifier validation from key persistence
validation to clarify that key identifiers
are not specific to persistent keys.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron
2020-07-17 16:11:30 +02:00
parent a455e71588
commit d2ed4815da
3 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/psa_crypto.c
View File

@ -1776,17 +1776,28 @@ static psa_status_t psa_validate_key_attributes(
psa_se_drv_table_entry_t **p_drv )
{
psa_status_t status = PSA_ERROR_INVALID_ARGUMENT;
psa_key_lifetime_t lifetime = psa_get_key_lifetime( attributes );
status = psa_validate_key_location( psa_get_key_lifetime( attributes ),
p_drv );
if( status != PSA_SUCCESS )
return( status );
status = psa_validate_key_persistence( psa_get_key_lifetime( attributes ),
psa_get_key_id( attributes ) );
status = psa_validate_key_persistence( lifetime );
if( status != PSA_SUCCESS )
return( status );
/* Validate the key identifier only in the case of a persistent key. */
if ( ! PSA_KEY_LIFETIME_IS_VOLATILE( lifetime ) )
{
status = psa_validate_key_id(
psa_get_key_id( attributes ),
psa_key_lifetime_is_external( lifetime ) );
if( status != PSA_SUCCESS )
return( status );
}
status = psa_validate_key_policy( &attributes->core.policy );
if( status != PSA_SUCCESS )
return( status );