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 <Gilles.Peskine@arm.com>

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

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
 

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
 

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