commit 99360e81af64abdd2e05fcb57ba9aa23d4d383ae
author Jamie Fox <jamie.fox@arm.com> Thu Feb 20 16:00:09 2020 +0000
committer Soby Mathew <soby.mathew@arm.com> Mon Feb 24 11:53:56 2020 +0000
tree a6aba9d0b0d2073ac026441dd1f079ff416b72f9
parent cf0d7d8cb74a3ba1a5e6789aa9f13e41d5c112da

Crypto: Implement key storage APIs

Change-Id: I9967c52aaa4d531ec89642b0e8f2bc50b2da5cfe
Signed-off-by: Jamie Fox <jamie.fox@arm.com>

secure_fw/services/crypto/crypto_key_derivation.c

diff --git a/secure_fw/services/crypto/crypto_key_derivation.c b/secure_fw/services/crypto/crypto_key_derivation.c
index 80958f5..c186518 100644
--- a/secure_fw/services/crypto/crypto_key_derivation.c
+++ b/secure_fw/services/crypto/crypto_key_derivation.c
@@ -274,8 +274,7 @@
     const psa_key_attributes_t *key_attributes = in_vec[1].base;
     psa_key_derivation_operation_t *operation = NULL;
     psa_key_handle_t *key_handle = out_vec[0].base;
-    //int32_t partition_id = 0;
-    //uint32_t index = 0;
+    uint32_t index;
 
     /* Look up the corresponding operation context */
     status = tfm_crypto_operation_lookup(TFM_CRYPTO_KEY_DERIVATION_OPERATION,
@@ -284,18 +283,18 @@
     if (status != PSA_SUCCESS) {
         return status;
     }
-    /*
-    status = tfm_crypto_check_key_storage(&partition_id, &index);
+
+    status = tfm_crypto_check_key_storage(&index);
     if (status != PSA_SUCCESS) {
         return status;
     }
-    */
-    status = psa_key_derivation_output_key(key_attributes, operation, key_handle);
-    /*
+
+    status = psa_key_derivation_output_key(key_attributes, operation,
+                                           key_handle);
     if (status == PSA_SUCCESS) {
-        status = tfm_crypto_set_key_storage(partition_id, index, *key_handle);
+        status = tfm_crypto_set_key_storage(index, *key_handle);
     }
-    */
+
     return status;
 #endif /* TFM_CRYPTO_KEY_DERIVATION_MODULE_DISABLED */
 }