From e23b6e4dc84ea5baf8e29b71a21ada2383eb1fc5 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 18 Dec 2025 22:22:33 +0100 Subject: [PATCH] Use the crypto makefile helpers in tf-psa-crypto Now that the crypto files have been moved to the crypto repository, consume them there. Signed-off-by: Gilles Peskine --- library/Makefile | 4 ++-- programs/Makefile | 2 +- scripts/common.make | 2 +- tests/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/Makefile b/library/Makefile index 17155c80ad..ad2854ad3a 100644 --- a/library/Makefile +++ b/library/Makefile @@ -36,7 +36,7 @@ This is a fatal error endif include $(MBEDTLS_PATH)/framework/exported.make -include $(MBEDTLS_PATH)/scripts/crypto-common.make +include $(MBEDTLS_PATH)/tf-psa-crypto/scripts/crypto-common.make # For the time being, Mbed TLS uses non-public interfaces of TF-PSA-Crypto, # so we include both public and internal headers. @@ -155,7 +155,7 @@ else all: shared static endif -include crypto-library.make +include $(TF_PSA_CRYPTO_CORE_PATH)/crypto-library.make static: libmbedcrypto.a libmbedx509.a libmbedtls.a cd ../tests && echo "This is a seedfile that contains 64 bytes (65 on Windows)......" > seedfile diff --git a/programs/Makefile b/programs/Makefile index b1aee9c57a..36679dcb0f 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -29,7 +29,7 @@ endif # before including crypto-programs.make. default: all -include crypto-programs.make +include $(TF_PSA_CRYPTO_PATH)/programs/crypto-programs.make LOCAL_CFLAGS += -I$(FRAMEWORK)/tests/programs diff --git a/scripts/common.make b/scripts/common.make index 18dd29d2ed..cc63bb7e77 100644 --- a/scripts/common.make +++ b/scripts/common.make @@ -29,7 +29,7 @@ This is a fatal error endif include $(MBEDTLS_PATH)/framework/exported.make -include $(MBEDTLS_PATH)/scripts/crypto-common.make +include $(MBEDTLS_PATH)/tf-psa-crypto/scripts/crypto-common.make # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS diff --git a/tests/Makefile b/tests/Makefile index 2a7040279f..b24c4ef9e2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -8,7 +8,7 @@ TEST_FLAGS ?= $(if $(filter-out 0 OFF Off off NO No no FALSE False false N n,$(C # before including crypto-programs.make. default: all -include crypto-tests.make +include $(TF_PSA_CRYPTO_PATH)/tests/crypto-tests.make # Also include private headers, for the sake of invasive tests. LOCAL_CFLAGS += -I$(MBEDTLS_PATH)/library