commit 04debbd6e157d8ab9f80525e296303e830838c50
author Antonio de Angelis <antonio.deangelis@arm.com> Mon Oct 14 12:12:52 2019 +0100
committer Soby Mathew <soby.mathew@arm.com> Mon Feb 24 11:53:56 2020 +0000
tree f9f6f70898661ee377943ea65c23d8560bca7e00
parent dad6ca656729478d199434a090b55bb3d36d4e86

Crypto: Align to Mbed Crypto 3.0.1

This patch upgrades the Crypto service to be able
to use Mbed Crypto 3.0.1:

- Updates the PSA crypto headers to latest available in mbed-crypto
- Updates the service implementation
- Updates the test suites where needed
- Updates the SST and Attestation interfaces
  towards cryptographic functionalities
- Updates documentation to reflect updated
  requirements, and changes in the integration guide

This patch migrates the use of psa_asymmetric_sign() and
psa_asymmetric_verify() to the non-deprecated versions of
the API psa_sign_hash() and psa_verify_hash().

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

secure_fw/services/crypto/CMakeLists.inc

diff --git a/secure_fw/services/crypto/CMakeLists.inc b/secure_fw/services/crypto/CMakeLists.inc
index 2389a5b..7fb6a85 100644
--- a/secure_fw/services/crypto/CMakeLists.inc
+++ b/secure_fw/services/crypto/CMakeLists.inc
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -49,7 +49,7 @@
                     "${CRYPTO_DIR}/crypto_key.c"
                     "${CRYPTO_DIR}/crypto_aead.c"
                     "${CRYPTO_DIR}/crypto_asymmetric.c"
-                    "${CRYPTO_DIR}/crypto_generator.c"
+                    "${CRYPTO_DIR}/crypto_key_derivation.c"
                     "${CRYPTO_DIR}/tfm_crypto_secure_api.c"
       )
 
@@ -107,11 +107,11 @@
   else()
     message("- CRYPTO_CIPHER_MODULE_DISABLED: " ${CRYPTO_CIPHER_MODULE_DISABLED})
   endif()
-  if (NOT DEFINED CRYPTO_GENERATOR_MODULE_DISABLED)
-    message("- GENERATOR module enabled")
-    set(CRYPTO_GENERATOR_MODULE_DISABLED 0)
+  if (NOT DEFINED CRYPTO_KEY_DERIVATION_MODULE_DISABLED)
+    message("- KEY_DERIVATION module enabled")
+    set(CRYPTO_KEY_DERIVATION_MODULE_DISABLED 0)
   else()
-    message("- CRYPTO_GENERATOR_MODULE_DISABLED: " ${CRYPTO_GENERATOR_MODULE_DISABLED})
+    message("- CRYPTO_KEY_DERIVATION_MODULE_DISABLED: " ${CRYPTO_KEY_DERIVATION_MODULE_DISABLED})
   endif()
   if (NOT DEFINED CRYPTO_ASYMMETRIC_MODULE_DISABLED)
     message("- ASYMMETRIC module enabled")