commit ab79bd27b6fe7c91a77246138f1c26c2d77f396f
author Ronald Cron <ronald.cron@arm.com> Sat Nov 14 14:19:11 2020 +0100
committer Ronald Cron <ronald.cron@arm.com> Thu Nov 19 16:59:40 2020 +0100
tree 04da8cb7bc9ad93606a2426fecb050f9238456ac
parent 81709fc78ebe4eee999972a82f4b2108c80fb153

tests: slot mgmt: Improve key_slot_eviction_to_import_new_key test

Signed-off-by: Ronald Cron <ronald.cron@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 08f1f7e..474fbe7 100644
--- a/tests/suites/test_suite_psa_crypto_slot_management.function
+++ b/tests/suites/test_suite_psa_crypto_slot_management.function
@@ -915,15 +915,16 @@
     i = PSA_KEY_SLOT_COUNT;
     key = mbedtls_svc_key_id_make( i, i + 1 );
     psa_set_key_id( &attributes, key );
-
-    if( lifetime == PSA_KEY_LIFETIME_VOLATILE )
-        psa_set_key_lifetime( &attributes, PSA_KEY_LIFETIME_VOLATILE );
+    psa_set_key_lifetime( &attributes, lifetime );
 
     PSA_ASSERT( psa_import_key( &attributes,
                                 (uint8_t *) &i, sizeof( i ),
                                 &returned_key_id ) );
     if( lifetime != PSA_KEY_LIFETIME_VOLATILE )
         TEST_ASSERT( mbedtls_svc_key_id_equal( returned_key_id, key ) );
+    else
+        TEST_ASSERT( psa_key_id_is_volatile(
+                     MBEDTLS_SVC_KEY_ID_GET_KEY_ID( returned_key_id ) ) );
 
     /*
      * Check that we can export all ( PSA_KEY_SLOT_COUNT + 1 ) keys,