commit e95a643839cb3ff7f74a525e6ea64dbe9f643491
author Gilles Peskine <Gilles.Peskine@arm.com> Sun Feb 14 12:40:07 2021 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Feb 23 20:29:38 2021 +0100
tree 13807a2c8089b58b78810624c5009c00e2d90612
parent 2385f71abd5554c3a683c7111b46e13b4dda1f7d

Prepare to move persistent storage cleanup to common code

Rename functions to mbedtls_test_xxx and make them non-static if
they're going to be exported.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/suites/test_suite_psa_crypto_slot_management.function

diff --git a/tests/suites/test_suite_psa_crypto_slot_management.function b/tests/suites/test_suite_psa_crypto_slot_management.function
index dbf05d2..5a5f933 100644
--- a/tests/suites/test_suite_psa_crypto_slot_management.function
+++ b/tests/suites/test_suite_psa_crypto_slot_management.function
@@ -53,7 +53,7 @@
 static size_t num_key_ids_used;
 
 /* 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;
     if( MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key_id ) >
@@ -74,10 +74,10 @@
     return( 1 );
 }
 #define TEST_USES_KEY_ID( key_id )                       \
-    TEST_ASSERT( test_uses_key_id( key_id ) )
+    TEST_ASSERT( mbedtls_test_uses_key_id( key_id ) )
 
 /* Destroy all key ids that may have been created by the current test case. */
-static void psa_purge_key_storage( void )
+void mbedtls_test_psa_purge_key_storage( void )
 {
     size_t i;
     for( i = 0; i < num_key_ids_used; i++ )
@@ -383,7 +383,7 @@
     psa_reset_key_attributes( &read_attributes );
 
     PSA_DONE( );
-    psa_purge_key_storage( );
+    mbedtls_test_psa_purge_key_storage( );
     mbedtls_free( reexported );
 }
 /* END_CASE */
@@ -457,7 +457,7 @@
     psa_reset_key_attributes( &attributes );
 
     PSA_DONE( );
-    psa_purge_key_storage( );
+    mbedtls_test_psa_purge_key_storage( );
 }
 /* END_CASE */
 
@@ -517,7 +517,7 @@
 exit:
     PSA_DONE( );
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
-    psa_purge_key_storage( );
+    mbedtls_test_psa_purge_key_storage( );
 #endif
 }
 /* END_CASE */
@@ -655,7 +655,7 @@
     PSA_DONE( );
     mbedtls_free( export_buffer );
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
-    psa_purge_key_storage( );
+    mbedtls_test_psa_purge_key_storage( );
 #endif
 }
 /* END_CASE */
@@ -773,7 +773,7 @@
     PSA_DONE( );
     mbedtls_free( export_buffer );
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
-    psa_purge_key_storage( );
+    mbedtls_test_psa_purge_key_storage( );
 #endif
 }
 /* END_CASE */