commit cbd7beab0d8ce79bf2c5d044ac7a5a86ec2b9277
author Ronald Cron <ronald.cron@arm.com> Wed Nov 11 14:57:44 2020 +0100
committer Ronald Cron <ronald.cron@arm.com> Thu Nov 19 16:59:40 2020 +0100
tree 5f08b2ed88740c2c950f6b12ed71c15c68216218
parent f473d8b44b05a0cfa117e28bfd8212e55e353e24

psa: slot mgmt: Simplify psa_validate_key_id

Special handling of volatile key identifiers is not
needed eventually, they can be handled just as
key identifier in the vendor range.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/psa_crypto_slot_management.c

diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c
index 9075beb..d8a3ca8 100644
--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@@ -52,7 +52,7 @@
 static psa_global_data_t global_data;
 
 psa_status_t psa_validate_key_id(
-    mbedtls_svc_key_id_t key, int vendor_ok, int volatile_ok )
+    mbedtls_svc_key_id_t key, int vendor_ok )
 {
     psa_key_id_t key_id = MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key );
 
@@ -62,12 +62,7 @@
 
     if( vendor_ok &&
         ( PSA_KEY_ID_VENDOR_MIN <= key_id ) &&
-        ( key_id < PSA_KEY_ID_VOLATILE_MIN ) )
-        return( PSA_SUCCESS );
-
-    if( volatile_ok &&
-        ( PSA_KEY_ID_VOLATILE_MIN <= key_id ) &&
-        ( key_id <= PSA_KEY_ID_VOLATILE_MAX ) )
+        ( key_id <= PSA_KEY_ID_VENDOR_MAX ) )
         return( PSA_SUCCESS );
 
     return( PSA_ERROR_INVALID_HANDLE );
@@ -122,7 +117,7 @@
     }
     else
     {
-        status = psa_validate_key_id( key, 1, 1 );
+        status = psa_validate_key_id( key, 1 );
         if( status != PSA_SUCCESS )
             return( status );