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

Push back on divergence of duplicated code

Browse source 
Persistent storage common code from
test_suite_psa_crypto_slot_management.function had been duplicated in
test_suite_psa_crypto_se_driver_hal.function and the copy had slightly
diverged. Re-align the copy in preparation from moving the code to a
common module and using that sole copy in both test suites.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-02-14 23:16:21 +01:00
parent e95a643839
commit b9ad79417d
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tests/suites/test_suite_psa_crypto_se_driver_hal.function
View file

@ -767,40 +767,47 @@ exit:
return( ok ); return( ok );
} }
static mbedtls_svc_key_id_t key_ids_used_in_test[10]; static mbedtls_svc_key_id_t key_ids_used_in_test[9];
static size_t num_key_ids_used; static size_t num_key_ids_used;
/* Record a key id as potentially used in a test case. */ /* Record a key id as potentially used in a test case. */
static int test_uses_key_id( mbedtls_svc_key_id_t key_id ) int mbedtls_test_uses_key_id( mbedtls_svc_key_id_t key_id )
{ {
size_t i; size_t i;
if( MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key_id ) >
PSA_MAX_PERSISTENT_KEY_IDENTIFIER )
{
/* Don't touch key id values that designate non-key files. */
return( 1 );
}
for( i = 0; i < num_key_ids_used ; i++ ) for( i = 0; i < num_key_ids_used ; i++ )
{ {
if( mbedtls_svc_key_id_equal( key_id, key_ids_used_in_test[i] ) ) if( mbedtls_svc_key_id_equal( key_id, key_ids_used_in_test[i] ) )
return( 1 ); return( 1 );
} }
if( num_key_ids_used == ARRAY_LENGTH( key_ids_used_in_test ) )
if( num_key_ids_used >= ARRAY_LENGTH( key_ids_used_in_test ) )
return( 0 ); return( 0 );
key_ids_used_in_test[num_key_ids_used] = key_id; key_ids_used_in_test[num_key_ids_used] = key_id;
++num_key_ids_used; ++num_key_ids_used;
return( 1 ); return( 1 );
} }
#define TEST_USES_KEY_ID( key_id ) \ #define TEST_USES_KEY_ID( key_id ) \
TEST_ASSERT( test_uses_key_id( key_id ) ) TEST_ASSERT( mbedtls_test_uses_key_id( key_id ) )
static void psa_purge_storage( void ) /* Destroy all key ids that may have been created by the current test case. */
void mbedtls_test_psa_purge_key_storage( void )
{ {
size_t i; size_t i;
psa_key_location_t location;
for( i = 0; i < num_key_ids_used; i++ ) for( i = 0; i < num_key_ids_used; i++ )
psa_destroy_persistent_key( key_ids_used_in_test[i] ); psa_destroy_persistent_key( key_ids_used_in_test[i] );
num_key_ids_used = 0; num_key_ids_used = 0;
}
static void psa_purge_storage( void )
{
psa_key_location_t location;
mbedtls_test_psa_purge_key_storage( );
/* Purge the transaction file. */ /* Purge the transaction file. */
psa_crypto_stop_transaction( ); psa_crypto_stop_transaction( );