commit 25e2b2dba5d7eb3ba0da14384a6c8240278f5c15
author Antonio de Angelis <antonio.deangelis@arm.com> Thu Apr 25 14:49:50 2019 +0100
committer Antonio de Angelis <antonio.deangelis@arm.com> Fri May 24 10:06:47 2019 +0100
tree 028ff9686cfc76173caccda0146fe5d120d12429
parent 3a97d86309f4de9374bb8b2b43e4055c748e0f2b

Crypto: Implement additional PSA Crypto APIs

This patch implements additional missing APIs available
in the PSA Crypto API headers.

Change-Id: I453f6829ed2c87a47546514becda599ecd1273a4
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>

secure_fw/services/crypto/crypto_alloc.c

diff --git a/secure_fw/services/crypto/crypto_alloc.c b/secure_fw/services/crypto/crypto_alloc.c
index ef0da17..db9c6af 100644
--- a/secure_fw/services/crypto/crypto_alloc.c
+++ b/secure_fw/services/crypto/crypto_alloc.c
@@ -29,9 +29,10 @@
     uint32_t in_use;                /*!< Indicates if the operation is in use */
     enum tfm_crypto_operation_type type; /*!< Type of the operation */
     union {
-        psa_cipher_operation_t cipher;   /*!< Cipher operation context */
-        psa_mac_operation_t mac;         /*!< MAC operation context */
-        psa_hash_operation_t hash;       /*!< Hash operation context */
+        psa_cipher_operation_t cipher;    /*!< Cipher operation context */
+        psa_mac_operation_t mac;          /*!< MAC operation context */
+        psa_hash_operation_t hash;        /*!< Hash operation context */
+        psa_crypto_generator_t generator; /*!< Generator operation context */
     } operation;
 };
 
@@ -61,6 +62,9 @@
     case TFM_CRYPTO_HASH_OPERATION:
         mem_size = sizeof(psa_hash_operation_t);
         break;
+    case TFM_CRYPTO_GENERATOR_OPERATION:
+        mem_size = sizeof(psa_crypto_generator_t);
+        break;
     case TFM_CRYPTO_OPERATION_NONE:
     default:
         mem_size = 0;
@@ -117,6 +121,7 @@
     if ( (h_val != TFM_CRYPTO_INVALID_HANDLE) &&
          (h_val < TFM_CRYPTO_CONC_OPER_NUM) &&
          (operation[h_val].in_use == TFM_CRYPTO_IN_USE) ) {
+
         memset_operation_context(h_val);
         operation[h_val].in_use = TFM_CRYPTO_NOT_IN_USE;
         operation[h_val].type = TFM_CRYPTO_OPERATION_NONE;
@@ -135,6 +140,7 @@
          (handle < TFM_CRYPTO_CONC_OPER_NUM) &&
          (operation[handle].in_use == TFM_CRYPTO_IN_USE) &&
          (operation[handle].type == type) ) {
+
         *ctx = (void *) &(operation[handle].operation);
         return PSA_SUCCESS;
     }