yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-04-29 03:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify psa_open_key

Browse source 
Simplify psa_open_key now that the old method for key creation
(returning a handle to a slot with no key material) no longer exists.
This commit is contained in:
Gilles Peskine 2019-05-27 19:04:07 +02:00
parent 267c65666a
commit 70e085a7d9
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
library/psa_crypto_slot_management.c
View file

@ -185,23 +185,19 @@ psa_status_t psa_validate_persistent_key_parameters(
#endif /* !MBEDTLS_PSA_CRYPTO_STORAGE_C */ #endif /* !MBEDTLS_PSA_CRYPTO_STORAGE_C */
} }
static psa_status_t persistent_key_setup( psa_key_lifetime_t lifetime, psa_status_t psa_open_key( psa_key_file_id_t id, psa_key_handle_t *handle )
psa_key_file_id_t id,
psa_key_handle_t *handle,
int creating )
{ {
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
psa_status_t status; psa_status_t status;
psa_status_t wanted_load_status =
( creating ? PSA_ERROR_DOES_NOT_EXIST : PSA_SUCCESS );
psa_key_slot_t *slot; psa_key_slot_t *slot;
*handle = 0; *handle = 0;
status = psa_validate_persistent_key_parameters( lifetime, id, creating ); status = psa_validate_persistent_key_parameters(
PSA_KEY_LIFETIME_PERSISTENT, id, 0 );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
status = psa_internal_allocate_key_slot( handle, &slot ); status = psa_internal_allocate_key_slot( handle, &slot );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
@ -210,24 +206,20 @@ static psa_status_t persistent_key_setup( psa_key_lifetime_t lifetime,
slot->persistent_storage_id = id; slot->persistent_storage_id = id;
status = psa_load_persistent_key_into_slot( slot ); status = psa_load_persistent_key_into_slot( slot );
if( status != wanted_load_status ) if( status != PSA_SUCCESS )
{ {
psa_wipe_key_slot( slot ); psa_wipe_key_slot( slot );
*handle = 0; *handle = 0;
} }
return( status ); return( status );
#else /* defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */ #else /* defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */
(void) wanted_load_status; (void) id;
*handle = 0;
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
#endif /* !defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */ #endif /* !defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */
} }
psa_status_t psa_open_key( psa_key_file_id_t id, psa_key_handle_t *handle )
{
return( persistent_key_setup( PSA_KEY_LIFETIME_PERSISTENT,
id, handle, 0 ) );
}
psa_status_t psa_close_key( psa_key_handle_t handle ) psa_status_t psa_close_key( psa_key_handle_t handle )
{ {
psa_status_t status; psa_status_t status;