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

Drivers must have a psa_destroy_key method

Browse source 
Drivers that allow destroying a key must have a destroy method. This
test bug was previously not caught because of an implementation bug
that lost the error triggered by the missing destroy method.
This commit is contained in:
Gilles Peskine 2019-08-13 16:03:28 +02:00
parent 4b7f340fbf
commit 5da7b3e55c
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/suites/test_suite_psa_crypto_se_driver_hal.function
View file

@ -162,6 +162,17 @@ static psa_status_t null_generate( psa_drv_se_context_t *context,
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }
/* Null destroy: do nothing, but pretend it worked. */
static psa_status_t null_destroy( psa_drv_se_context_t *context,
void *persistent_data,
psa_key_slot_number_t slot_number )
{
(void) context;
(void) persistent_data;
(void) slot_number;
return( PSA_SUCCESS );
}
/****************************************************************/ /****************************************************************/
@ -898,6 +909,7 @@ void import_key_smoke( int type_arg, int alg_arg,
driver.persistent_data_size = sizeof( psa_key_slot_number_t ); driver.persistent_data_size = sizeof( psa_key_slot_number_t );
key_management.p_allocate = counter_allocate; key_management.p_allocate = counter_allocate;
key_management.p_import = null_import; key_management.p_import = null_import;
key_management.p_destroy = null_destroy;
PSA_ASSERT( psa_register_se_driver( lifetime, &driver ) ); PSA_ASSERT( psa_register_se_driver( lifetime, &driver ) );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
@ -995,6 +1007,7 @@ void generate_key_smoke( int type_arg, int bits_arg, int alg_arg )
driver.persistent_data_size = sizeof( psa_key_slot_number_t ); driver.persistent_data_size = sizeof( psa_key_slot_number_t );
key_management.p_allocate = counter_allocate; key_management.p_allocate = counter_allocate;
key_management.p_generate = null_generate; key_management.p_generate = null_generate;
key_management.p_destroy = null_destroy;
PSA_ASSERT( psa_register_se_driver( lifetime, &driver ) ); PSA_ASSERT( psa_register_se_driver( lifetime, &driver ) );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
@ -1220,10 +1233,11 @@ void register_key_smoke_test( int lifetime_arg,
memset( &driver, 0, sizeof( driver ) ); memset( &driver, 0, sizeof( driver ) );
driver.hal_version = PSA_DRV_SE_HAL_VERSION; driver.hal_version = PSA_DRV_SE_HAL_VERSION;
memset( &key_management, 0, sizeof( key_management ) );
driver.key_management = &key_management;
key_management.p_destroy = null_destroy;
if( validate >= 0 ) if( validate >= 0 )
{ {
memset( &key_management, 0, sizeof( key_management ) );
driver.key_management = &key_management;
key_management.p_validate_slot_number = validate_slot_number_as_directed; key_management.p_validate_slot_number = validate_slot_number_as_directed;
validate_slot_number_directions.slot_number = wanted_slot; validate_slot_number_directions.slot_number = wanted_slot;
validate_slot_number_directions.method = PSA_KEY_CREATION_REGISTER; validate_slot_number_directions.method = PSA_KEY_CREATION_REGISTER;