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

psa: Add access counter check in slot wipe

Browse source 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2020-10-30 14:07:07 +01:00
parent 0c3752a46b
commit ddd3d05803
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
library/psa_crypto.c
View file

@ -1299,6 +1299,27 @@ static psa_status_t psa_remove_key_data_from_memory( psa_key_slot_t *slot )
psa_status_t psa_wipe_key_slot( psa_key_slot_t *slot )
{
psa_status_t status = psa_remove_key_data_from_memory( slot );
/*
* As the return error code may not be handled in case of multiple errors,
* do our best to report an unexpected access counter: if available
* call MBEDTLS_PARAM_FAILED that may terminate execution (if called as
* part of the execution of a test suite this will stop the test suite
* execution) and if MBEDTLS_PARAM_FAILED does not terminate execution
* ouput an error message on standard error output.
*/
if( slot->access_count != 1 )
{
#ifdef MBEDTLS_CHECK_PARAMS
MBEDTLS_PARAM_FAILED( slot->access_count == 1 );
#endif
#ifdef MBEDTLS_PLATFORM_C
mbedtls_fprintf( stderr,
"\nFATAL psa_wipe_key_slot Unexpected access counter value\n.");
#endif
status = PSA_ERROR_CORRUPTION_DETECTED;
}
/* Multipart operations may still be using the key. This is safe
* because all multipart operation objects are independent from
* the key slot: if they need to access the key after the setup

1
library/psa_crypto_slot_management.c
View file

@ -164,6 +164,7 @@ void psa_wipe_all_key_slots( void )
for( slot_idx = 0; slot_idx < PSA_KEY_SLOT_COUNT; slot_idx++ )
{
psa_key_slot_t *slot = &global_data.key_slots[ slot_idx ];
slot->access_count = 1;
(void) psa_wipe_key_slot( slot );
}
global_data.key_slots_initialized = 0;