commit 0e54ebc19440ccccc5b6f81f63868c0bcd99ce23
author Jamie Fox <jamie.fox@arm.com> Tue Apr 09 14:21:04 2019 +0100
committer Antonio de Angelis <antonio.deangelis@arm.com> Fri May 24 10:06:47 2019 +0100
tree c974980ae491eb461def6b0185518076c8954d7c
parent 4743e6731b0fe8a00ceebfd74da098c7676ac6e0

Crypto: Migrate the service to use Mbed crypto library

This patch migrates the TF-M Crypto service to use the
Mbed crypto library version 1.0.0. The regression tests
for Crypto are temporarily disabled to avoid build
failures due to changes in the PSA Crypto API. Some
regression tests for Attestation are disabled as well
as they rely on service-to-service calls to Crypto and
need to use the newer API.

Change-Id: Ic49fd162e89881d7a9e94fa4cddd76fe9a53fa03
Signed-off-by: Jamie Fox <jamie.fox@arm.com>
Co-authored-By: Antonio de Angelis <antonio.deangelis@arm.com>

secure_fw/services/crypto/CMakeLists.inc

diff --git a/secure_fw/services/crypto/CMakeLists.inc b/secure_fw/services/crypto/CMakeLists.inc
index 6a65652..f5910a8 100644
--- a/secure_fw/services/crypto/CMakeLists.inc
+++ b/secure_fw/services/crypto/CMakeLists.inc
@@ -9,7 +9,7 @@
 #This file assumes it will be included from a project specific cmakefile, and
 #will not create a library or executable.
 #Inputs:
-#       MBEDTLS_INSTALL_DIR - directory where mbed TLS headers and libraries can be found. Needed only when using CRYPTO_ENGINE_MBEDTLS ON.
+#       MBEDTLS_INSTALL_DIR - directory where Mbed Crypto headers and libraries can be found. Needed only when using CRYPTO_ENGINE_MBEDTLS ON.
 #       TFM_ROOT_DIR        - root directory of the TF-M repository.
 #Outputs:
 #       Will modify include directories to make the source compile.
@@ -47,7 +47,6 @@
                     "${CRYPTO_DIR}/crypto_hash.c"
                     "${CRYPTO_DIR}/crypto_mac.c"
                     "${CRYPTO_DIR}/crypto_key.c"
-                    "${CRYPTO_DIR}/crypto_engine.c"
                     "${CRYPTO_DIR}/crypto_aead.c"
                     "${CRYPTO_DIR}/tfm_crypto_secure_api.c"
       )
@@ -65,22 +64,16 @@
 
   #Inform the user about Crypto service features selected based on the Crypto service cmake flags
   message("The Crypto service compile configuration is as follows:")
-  message("- CRYPTO_ENGINE_MBEDTLS: " ${CRYPTO_ENGINE_MBEDTLS})
-  if (NOT DEFINED CRYPTO_KEY_STORAGE_NUM)
-    message("- CRYPTO_KEY_STORAGE_NUM using default value")
-  else()
-    message("- CRYPTO_KEY_STORAGE_NUM: " ${CRYPTO_KEY_STORAGE_NUM})
-  endif()
-  if (NOT DEFINED CRYPTO_KEY_MAX_KEY_LENGTH)
-    message("- CRYPTO_KEY_MAX_KEY_LENGTH using default value")
-  else()
-    message("- CRYPTO_KEY_MAX_KEY_LENGTH: " ${CRYPTO_KEY_MAX_KEY_LENGTH})
-  endif()
   if (NOT DEFINED CRYPTO_ENGINE_BUF_SIZE)
     message("- CRYPTO_ENGINE_BUF_SIZE using default value")
   else()
     message("- CRYPTO_ENGINE_BUF_SIZE: " ${CRYPTO_ENGINE_BUF_SIZE})
   endif()
+  if (NOT DEFINED CRYPTO_CONC_OPER_NUM)
+    message("- CRYPTO_CONC_OPER_NUM using default value")
+  else()
+    message("- CRYPTO_CONC_OPER_NUM: " ${CRYPTO_CONC_OPER_NUM})
+  endif()
   if (TFM_PSA_API)
     if (NOT DEFINED CRYPTO_IOVEC_BUFFER_SIZE)
       message("- CRYPTO_IOVEC_BUFFER_SIZE using default value")