From 70e085a7d985da23d0d7662c1b7c4e338b0e7a42 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Mon, 27 May 2019 19:04:07 +0200
Subject: [PATCH] Simplify psa_open_key

Simplify psa_open_key now that the old method for key creation
(returning a handle to a slot with no key material) no longer exists.
---
 library/psa_crypto_slot_management.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c
index 36900d92e0..0ffc2aae7c 100644
--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@@ -185,23 +185,19 @@ psa_status_t psa_validate_persistent_key_parameters(
 #endif /* !MBEDTLS_PSA_CRYPTO_STORAGE_C */
 }
 
-static psa_status_t persistent_key_setup( psa_key_lifetime_t lifetime,
-                                          psa_key_file_id_t id,
-                                          psa_key_handle_t *handle,
-                                          int creating )
+psa_status_t psa_open_key( psa_key_file_id_t id, psa_key_handle_t *handle )
 {
+#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
     psa_status_t status;
-    psa_status_t wanted_load_status =
-        ( creating ? PSA_ERROR_DOES_NOT_EXIST : PSA_SUCCESS );
     psa_key_slot_t *slot;
 
     *handle = 0;
 
-    status = psa_validate_persistent_key_parameters( lifetime, id, creating );
+    status = psa_validate_persistent_key_parameters(
+        PSA_KEY_LIFETIME_PERSISTENT, id, 0 );
     if( status != PSA_SUCCESS )
         return( status );
 
-#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
     status = psa_internal_allocate_key_slot( handle, &slot );
     if( status != PSA_SUCCESS )
         return( status );
@@ -210,24 +206,20 @@ static psa_status_t persistent_key_setup( psa_key_lifetime_t lifetime,
     slot->persistent_storage_id = id;
 
     status = psa_load_persistent_key_into_slot( slot );
-    if( status != wanted_load_status )
+    if( status != PSA_SUCCESS )
     {
         psa_wipe_key_slot( slot );
         *handle = 0;
     }
     return( status );
+
 #else /* defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */
-    (void) wanted_load_status;
+    (void) id;
+    *handle = 0;
     return( PSA_ERROR_NOT_SUPPORTED );
 #endif /* !defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) */
 }
 
-psa_status_t psa_open_key( psa_key_file_id_t id, psa_key_handle_t *handle )
-{
-    return( persistent_key_setup( PSA_KEY_LIFETIME_PERSISTENT,
-                                  id, handle, 0 ) );
-}
-
 psa_status_t psa_close_key( psa_key_handle_t handle )
 {
     psa_status_t status;