TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-03-20 11:11:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the crypto makefile helpers in tf-psa-crypto

Browse Source 
Now that the crypto files have been moved to the crypto repository, consume
them there.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2025-12-18 22:22:33 +01:00
parent fca232cb25
commit e23b6e4dc8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/Makefile
View File

@@ -36,7 +36,7 @@ This is a fatal error
endif endif
include $(MBEDTLS_PATH)/framework/exported.make 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, # For the time being, Mbed TLS uses non-public interfaces of TF-PSA-Crypto,
# so we include both public and internal headers. # so we include both public and internal headers.
@@ -155,7 +155,7 @@ else
all: shared static all: shared static
endif endif
include crypto-library.make include $(TF_PSA_CRYPTO_CORE_PATH)/crypto-library.make
static: libmbedcrypto.a libmbedx509.a libmbedtls.a static: libmbedcrypto.a libmbedx509.a libmbedtls.a
cd ../tests && echo "This is a seedfile that contains 64 bytes (65 on Windows)......" > seedfile cd ../tests && echo "This is a seedfile that contains 64 bytes (65 on Windows)......" > seedfile

2
programs/Makefile
View File

@@ -29,7 +29,7 @@ endif
# before including crypto-programs.make. # before including crypto-programs.make.
default: all default: all
include crypto-programs.make include $(TF_PSA_CRYPTO_PATH)/programs/crypto-programs.make
LOCAL_CFLAGS += -I$(FRAMEWORK)/tests/programs LOCAL_CFLAGS += -I$(FRAMEWORK)/tests/programs

2
scripts/common.make
View File

@@ -29,7 +29,7 @@ This is a fatal error
endif endif
include $(MBEDTLS_PATH)/framework/exported.make 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 # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS

2
tests/Makefile
View File

@@ -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. # before including crypto-programs.make.
default: all 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. # Also include private headers, for the sake of invasive tests.
LOCAL_CFLAGS += -I$(MBEDTLS_PATH)/library LOCAL_CFLAGS += -I$(MBEDTLS_PATH)/library