aboutsummaryrefslogtreecommitdiff
path: root/deployments/ts-demo/ts-demo.cmake
diff options
context:
space:
mode:
authorBalint Dobszay <balint.dobszay@arm.com>2021-05-10 16:27:18 +0200
committerGyörgy Szing <gyorgy.szing@arm.com>2021-07-02 14:04:06 +0200
commit3c52ce6203c82f53d1f636a5345a949317e73348 (patch)
tree448cfb2aac9b538893f0c5690a100ba2a7a3c437 /deployments/ts-demo/ts-demo.cmake
parent76e8a3c354be73126599fee628cb34befedbe8b8 (diff)
downloadtrusted-services-3c52ce6203c82f53d1f636a5345a949317e73348.tar.gz
Replace mbedcrypto dependency with Mbed TLS
Mbedcrypto as a separate project is deprecated, it was merged back to Mbed TLS. This commit updates the external dependency to use Mbed TLS. Since the current version of Mbed TLS uses the PSA Crypto API v1.0.0, the commit also makes the necessary changes to get in sync with this. Mbed TLS is capable of building three different libraries, but we only need libmbedcrypto.a out of these. An extra step is added to configure Mbed TLS to only produce this one, to shorten the build time. Mbed TLS provides a method to override the necessary options of its built-in default config, instead of providing a complete customized config file. This makes the config easier to read, since only those options are captured where we want to differ from the default. The current full config file is removed and replaced using this format. The changes introduced to get compatible with PSA Crypto API v1.0.0: * The psa_open_key() and psa_close_key() functions were removed from the API specification, remove all references from the code. * The key identifier and key handle concepts were merged in the API, replace all uses of psa_key_handle_t with psa_key_id_t. * Several internal implementation macros were removed from the API. Remove these from the code and replace with API macros where necessary. * The PSA_ALG_xxx and PSA_KEY_USAGE_xxx macros have new values in the API, update the code to reflect these changes. * The PSA_ECC_xxx and PSA_DH_xxx macros were renamed in the API. Update the code to reflect these changes. Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> Change-Id: I4d721717d9ff33b6bac85cfcb482ea719bec1b31
Diffstat (limited to 'deployments/ts-demo/ts-demo.cmake')
-rw-r--r--deployments/ts-demo/ts-demo.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/deployments/ts-demo/ts-demo.cmake b/deployments/ts-demo/ts-demo.cmake
index 828a31e8f..05a9c9f98 100644
--- a/deployments/ts-demo/ts-demo.cmake
+++ b/deployments/ts-demo/ts-demo.cmake
@@ -47,8 +47,8 @@ add_components(
#
#-------------------------------------------------------------------------------
-# Mbedcrypto
-include(${TS_ROOT}/external/mbed-crypto/mbedcrypto.cmake)
+# Mbed TLS provides libmbedcrypto
+include(${TS_ROOT}/external/MbedTLS/MbedTLS.cmake)
target_link_libraries(ts-demo PRIVATE mbedcrypto)
#-------------------------------------------------------------------------------