From ae5f6c4de1bbecaafa1eb100a7032c98b812fe28 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 11 Mar 2025 07:02:23 +0100 Subject: [PATCH 1/6] scripts: config.py: remove references to MBEDTLS_PSA_CRYPTO_SE_C Signed-off-by: Valerio Setti --- scripts/config.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/config.py b/scripts/config.py index 3508ce4797..417f6e25a2 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -162,7 +162,6 @@ EXCLUDE_FROM_BAREMETAL = frozenset([ 'MBEDTLS_PLATFORM_FPRINTF_ALT', # requires FILE* from stdio.h 'MBEDTLS_PLATFORM_NV_SEED_ALT', # requires a filesystem and ENTROPY_NV_SEED 'MBEDTLS_PLATFORM_TIME_ALT', # requires a clock and HAVE_TIME - 'MBEDTLS_PSA_CRYPTO_SE_C', # requires a filesystem and PSA_CRYPTO_STORAGE_C 'MBEDTLS_PSA_CRYPTO_STORAGE_C', # requires a filesystem 'MBEDTLS_PSA_ITS_FILE_C', # requires a filesystem 'MBEDTLS_THREADING_C', # requires a threading interface @@ -238,7 +237,6 @@ def crypto_adapter(adapter): return continuation DEPRECATED = frozenset([ - 'MBEDTLS_PSA_CRYPTO_SE_C', *PSA_DEPRECATED_FEATURE ]) def no_deprecated_adapter(adapter): From 9f2939c56d7407f53e2024146554bf90314c88a0 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 11 Mar 2025 07:03:08 +0100 Subject: [PATCH 2/6] test: components: remove references to MBEDTLS_PSA_CRYPTO_SE_C Signed-off-by: Valerio Setti --- tests/scripts/components-configuration.sh | 1 - tests/scripts/components-sanitizers.sh | 4 ---- 2 files changed, 5 deletions(-) diff --git a/tests/scripts/components-configuration.sh b/tests/scripts/components-configuration.sh index cee4d632f3..2dfa6d2114 100644 --- a/tests/scripts/components-configuration.sh +++ b/tests/scripts/components-configuration.sh @@ -277,7 +277,6 @@ component_test_no_platform () { scripts/config.py unset MBEDTLS_PLATFORM_C scripts/config.py unset MBEDTLS_NET_C scripts/config.py unset MBEDTLS_FS_IO - scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C scripts/config.py unset MBEDTLS_PSA_ITS_FILE_C scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED diff --git a/tests/scripts/components-sanitizers.sh b/tests/scripts/components-sanitizers.sh index 454d1407f6..45d0960a1d 100644 --- a/tests/scripts/components-sanitizers.sh +++ b/tests/scripts/components-sanitizers.sh @@ -114,9 +114,6 @@ component_test_tsan () { # Interruptible ECC tests are not thread safe scripts/config.py unset MBEDTLS_ECP_RESTARTABLE - # The deprecated MBEDTLS_PSA_CRYPTO_SE_C interface is not thread safe. - scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C - CC=clang cmake -D CMAKE_BUILD_TYPE:String=TSan . make @@ -189,4 +186,3 @@ component_release_test_valgrind_psa () { msg "test: main suites, Valgrind (full config)" make memcheck } - From ba66794fb4048b8d65587f901ad98c386a86da3f Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 11 Mar 2025 12:24:32 +0100 Subject: [PATCH 3/6] library: remove psa_crypto_se.c from Makefile Following the removal of MBEDTLS_PSA_CRYPTO_SE_C the file was removed from tf-psa-crypto. Signed-off-by: Valerio Setti --- library/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index 61b2623e2a..1c0e4d942a 100644 --- a/library/Makefile +++ b/library/Makefile @@ -113,7 +113,6 @@ OBJS_CRYPTO= \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_client.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_driver_wrappers_no_static.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_se.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_slot_management.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_storage.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_its_file.o \ From b33e06c56fe9c3e2e39bdb8f41eb4c0c3875d466 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Fri, 21 Mar 2025 15:32:09 +0100 Subject: [PATCH 4/6] tests: psasim: remove references to mbedtls_psa_register_se_key() Signed-off-by: Valerio Setti --- tests/psa-client-server/psasim/src/psa_sim_generate.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/psa-client-server/psasim/src/psa_sim_generate.pl b/tests/psa-client-server/psasim/src/psa_sim_generate.pl index 5490337cf8..5770deaa80 100755 --- a/tests/psa-client-server/psasim/src/psa_sim_generate.pl +++ b/tests/psa-client-server/psasim/src/psa_sim_generate.pl @@ -29,7 +29,6 @@ my @skip_functions = ( 'mbedtls_psa_get_stats', # uses unsupported type 'mbedtls_psa_inject_entropy', # not in the default config, generally not for client use anyway 'mbedtls_psa_platform_get_builtin_key', # not in the default config, uses unsupported type - 'mbedtls_psa_register_se_key', # not in the default config, generally not for client use anyway 'psa_get_key_slot_number', # not in the default config, uses unsupported type 'psa_key_derivation_verify_bytes', # not implemented yet 'psa_key_derivation_verify_key', # not implemented yet From f0ca71cb3cd180574def971d470df80e9c4e2d11 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 25 Mar 2025 14:19:03 +0100 Subject: [PATCH 5/6] framework: update reference Signed-off-by: Valerio Setti --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 72b5acd590..2b03d62924 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 72b5acd590097ee9d108b024bf727d752d18f97d +Subproject commit 2b03d629240c0c23a0bfa5444f005b8d9b6f8ba8 From a881db924fc40e81bf3e9409981d5761956765c0 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 25 Mar 2025 14:19:17 +0100 Subject: [PATCH 6/6] tf-psa-crypto: update reference Signed-off-by: Valerio Setti --- tf-psa-crypto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf-psa-crypto b/tf-psa-crypto index f5b4a9ce21..5048bced5e 160000 --- a/tf-psa-crypto +++ b/tf-psa-crypto @@ -1 +1 @@ -Subproject commit f5b4a9ce21ea86c00163e175540c2f7d26c65a36 +Subproject commit 5048bced5e1c000c0e3888be8126eb63a2b91937