From b9ad79417d72b856fb4917c97b2386571946f3a5 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Sun, 14 Feb 2021 23:16:21 +0100
Subject: [PATCH] Push back on divergence of duplicated code

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>
---
 ...st_suite_psa_crypto_se_driver_hal.function | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal.function b/tests/suites/test_suite_psa_crypto_se_driver_hal.function
index fa516c5d0..929ca96bd 100644
--- a/tests/suites/test_suite_psa_crypto_se_driver_hal.function
+++ b/tests/suites/test_suite_psa_crypto_se_driver_hal.function
@@ -767,40 +767,47 @@ exit:
     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;
 
 /* 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 ) >
+        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++ )
     {
         if( mbedtls_svc_key_id_equal( key_id, key_ids_used_in_test[i] ) )
             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 );
-
     key_ids_used_in_test[num_key_ids_used] = key_id;
     ++num_key_ids_used;
-
     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 ) )
 
-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;
-    psa_key_location_t location;
-
     for( i = 0; i < num_key_ids_used; i++ )
         psa_destroy_persistent_key( key_ids_used_in_test[i] );
     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. */
     psa_crypto_stop_transaction( );