aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaulik Patel <maulik.patel@arm.com>2021-01-06 14:09:22 +0000
committerKarl Zhang <karl.zhang@arm.com>2021-03-17 10:05:53 +0100
commit28659c498c3bdbbc610959e7518bece5aaf72a19 (patch)
tree31c56512a44b08ceda10c143e7bc86108de60b05 /config
parentf07e92e6e1c0453a488df6143818a25a37f011f4 (diff)
downloadtrusted-firmware-m-28659c498c3bdbbc610959e7518bece5aaf72a19.tar.gz
Crypto: Upgrade Mbed TLS to 2.25
Set the MBEDCRYPTO_VERSION to 2.25.0. First three patches in existing v2.24 already applied in v2.25 and hence removed. Replaced MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER with MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER in all configuration and source as updated in v2.25 library. Update all headers of psa/include as per mbedtls-v2.25 excluding changes required to hide some implementation. Update id field in the client_key_attributes structure to psa_key_id_t. Update Copyright year to 2021! Removed patch 006 as not required in MbedTLS v2.25.0. Update references of handle to key as per MbedTLS api changes. Increase NUM_HANDLES to 32 to accommodate crypto api tests. Added corresponding tfm implementation of psa_purge_key(). Signed-off-by: Maulik Patel <maulik.patel@arm.com> Change-Id: I6a532da96735cf32996250c4a8733a8654c1f44e
Diffstat (limited to 'config')
-rw-r--r--config/config_default.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config_default.cmake b/config/config_default.cmake
index a7a37b5e50..35f9375bf5 100644
--- a/config/config_default.cmake
+++ b/config/config_default.cmake
@@ -151,7 +151,7 @@ set(TFM_CRYPTO_TEST_HKDF ON CACHE BOOL "Test SHA-51
################################## Dependencies ################################
set(MBEDCRYPTO_PATH "DOWNLOAD" CACHE PATH "Path to Mbed Crypto (or DOWNLOAD to fetch automatically")
-set(MBEDCRYPTO_VERSION "mbedtls-2.24.0" CACHE STRING "The version of Mbed Crypto to use")
+set(MBEDCRYPTO_VERSION "mbedtls-2.25.0" CACHE STRING "The version of Mbed Crypto to use")
set(MBEDCRYPTO_GIT_REMOTE "https://github.com/ARMmbed/mbedtls.git" CACHE STRING "The URL (or path) to retrieve MbedTLS from.")
set(MBEDCRYPTO_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Build type of Mbed Crypto library")
set(TFM_MBEDCRYPTO_CONFIG_PATH "${CMAKE_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h" CACHE PATH "Config to use for Mbed Crypto")