From d57a0985ab762846b024814a0f43eebab678798e Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 22 Sep 2025 15:51:35 +0200 Subject: [PATCH 1/2] Add dependency of tf_psa_crypto_config on generated config check headers Fix the build of libtfpsacrypto when generated files are not already present. Signed-off-by: Gilles Peskine --- library/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/Makefile b/library/Makefile index 21f85b67d9..a0b6d6eb1d 100644 --- a/library/Makefile +++ b/library/Makefile @@ -356,6 +356,8 @@ $(TF_PSA_CRYPTO_GENERATED_CONFIG_CHECK_FILES): echo " Gen $(TF_PSA_CRYPTO_GENERATED_CONFIG_CHECK_FILES)" $(PYTHON) $(TF_PSA_CRYPTO_CORE_PATH)/../scripts/generate_config_checks.py +$(TF_PSA_CRYPTO_CORE_PATH)/tf_psa_crypto_config.o: $(TF_PSA_CRYPTO_GENERATED_CONFIG_CHECK_FILES) + clean: ifndef WINDOWS rm -f *.o *.s libmbed* From 9da0dce84557c2464ece6a3f452658b41c80b0eb Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 22 Sep 2025 15:55:10 +0200 Subject: [PATCH 2/2] Bypass config checks when setting a low-level option directly Signed-off-by: Gilles Peskine --- tests/scripts/components-configuration-crypto.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh index 28fc189d0a..0aeaa673df 100644 --- a/tests/scripts/components-configuration-crypto.sh +++ b/tests/scripts/components-configuration-crypto.sh @@ -2436,7 +2436,10 @@ component_test_xts () { # supported through the PSA API. msg "build: Default + MBEDTLS_CIPHER_MODE_XTS" - echo "#define MBEDTLS_CIPHER_MODE_XTS" > psa_user_config.h + cat <<'EOF' >psa_user_config.h +#define MBEDTLS_CIPHER_MODE_XTS +#define TF_PSA_CRYPTO_CONFIG_CHECK_BYPASS +EOF cmake -DTF_PSA_CRYPTO_USER_CONFIG_FILE="psa_user_config.h" make