Merge pull request #11239 from Patater/import-mbedtls-crypto-from-mbedcrypto

crypto: Copy legacy crypto from Mbed Crypto

Author: 0xc0170

features/lwipstack/lwipopts.h

@@ -399,7 +399,7 @@
 #include "lwip_tcp_isn.h"
 #define LWIP_HOOK_TCP_ISN lwip_hook_tcp_isn
 #ifdef MBEDTLS_MD5_C
-#include "mbedtls/inc/mbedtls/md5.h"
+#include "mbedtls/md5.h"
 #define LWIP_USE_EXTERNAL_MBEDTLS 1
 #endif
 

features/mbedtls/importer/Makefile

@@ -41,67 +41,6 @@ MBED_TLS_DIR:=TARGET_IGNORE/mbedtls
 MBED_TLS_API:=$(MBED_TLS_DIR)/include/mbedtls
 MBED_TLS_GIT_CFG=$(MBED_TLS_DIR)/.git/config
 
-CRYPTO_SRC := \
-	$(TARGET_SRC)/aes.c \
-	$(TARGET_SRC)/aesni.c \
-	$(TARGET_SRC)/arc4.c \
-	$(TARGET_SRC)/aria.c \
-	$(TARGET_SRC)/asn1parse.c \
-	$(TARGET_SRC)/asn1write.c \
-	$(TARGET_SRC)/base64.c \
-	$(TARGET_SRC)/bignum.c \
-	$(TARGET_SRC)/blowfish.c \
-	$(TARGET_SRC)/camellia.c \
-	$(TARGET_SRC)/ccm.c \
-	$(TARGET_SRC)/chacha20.c \
-	$(TARGET_SRC)/chachapoly.c \
-	$(TARGET_SRC)/cipher.c \
-	$(TARGET_SRC)/cipher_wrap.c \
-	$(TARGET_SRC)/cmac.c \
-	$(TARGET_SRC)/ctr_drbg.c \
-	$(TARGET_SRC)/des.c \
-	$(TARGET_SRC)/dhm.c \
-	$(TARGET_SRC)/ecdh.c \
-	$(TARGET_SRC)/ecdsa.c \
-	$(TARGET_SRC)/ecjpake.c \
-	$(TARGET_SRC)/ecp.c \
-	$(TARGET_SRC)/ecp_curves.c \
-	$(TARGET_SRC)/entropy.c \
-	$(TARGET_SRC)/entropy_poll.c \
-	$(TARGET_SRC)/gcm.c \
-	$(TARGET_SRC)/havege.c \
-	$(TARGET_SRC)/hkdf.c \
-	$(TARGET_SRC)/hmac_drbg.c \
-	$(TARGET_SRC)/md.c \
-	$(TARGET_SRC)/md2.c \
-	$(TARGET_SRC)/md4.c \
-	$(TARGET_SRC)/md5.c \
-	$(TARGET_SRC)/md_wrap.c \
-	$(TARGET_SRC)/memory_buffer_alloc.c \
-	$(TARGET_SRC)/nist_kw.c \
-	$(TARGET_SRC)/oid.c \
-	$(TARGET_SRC)/padlock.c \
-	$(TARGET_SRC)/pem.c \
-	$(TARGET_SRC)/pk.c \
-	$(TARGET_SRC)/pk_wrap.c \
-	$(TARGET_SRC)/pkcs12.c \
-	$(TARGET_SRC)/pkcs5.c \
-	$(TARGET_SRC)/pkparse.c \
-	$(TARGET_SRC)/pkwrite.c \
-	$(TARGET_SRC)/platform.c \
-	$(TARGET_SRC)/platform_util.c \
-	$(TARGET_SRC)/poly1305.c \
-	$(TARGET_SRC)/ripemd160.c \
-	$(TARGET_SRC)/rsa_internal.c \
-	$(TARGET_SRC)/rsa.c \
-	$(TARGET_SRC)/sha1.c \
-	$(TARGET_SRC)/sha256.c \
-	$(TARGET_SRC)/sha512.c \
-	$(TARGET_SRC)/threading.c \
-	$(TARGET_SRC)/timing.c \
-	$(TARGET_SRC)/xtea.c \
-	# end
-
 .PHONY: all deploy deploy-tests rsync mbedtls clean update
 
 all: mbedtls
@@ -114,9 +53,6 @@ rsync:
 	rm -rf $(TARGET_SRC)
 	rsync -a --exclude='*.txt' $(MBED_TLS_DIR)/library/ $(TARGET_SRC)
 	#
-	# Remove files that duplicate Mbed Crypto
-	rm -rf $(CRYPTO_SRC)
-	#
 	# Copying mbed TLS headers to mbed includes...
 	rm -rf $(TARGET_INC)
 	mkdir -p $(TARGET_INC)

features/mbedtls/importer/adjust-config.sh

@@ -57,7 +57,7 @@ add_code
     "#else\n"
 
 add_code                                                                                                       \
-    "#include \"check_config.h\"\n"                                                                            \
+    "#include \"mbedtls\/check_config.h\"\n"                                                                   \
     "\n"                                                                                                       \
     "#endif \/* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY && !MBEDTLS_ENTROPY_NV_SEED *\/\n" \
     "\n"                                                                                                       \

features/mbedtls/mbed-crypto/importer/Makefile

@@ -59,6 +59,7 @@ TARGET_NSPE:=$(TARGET_SRV_IMPL)/COMPONENT_NSPE
 # Mbed Crypto source directory - hidden from mbed via TARGET_IGNORE
 CRYPTO_DIR:=TARGET_IGNORE/mbed-crypto
 CRYPTO_API:=$(CRYPTO_DIR)/include/psa
+OLD_CRYPTO_API:=$(CRYPTO_DIR)/include/mbedtls
 CRYPTO_GIT_CFG=$(CRYPTO_DIR)/.git/config
 
 
@@ -72,6 +73,15 @@ rsync:
 	rm -rf $(TARGET_INC)
 	mkdir -p $(TARGET_INC)
 	rsync -a --delete --exclude='crypto_struct.h' $(CRYPTO_API) $(TARGET_INC)/
+	# Copy legacy Mbed TLS crypto headers, excluding headers duplicated in
+	# Mbed TLS.
+	rsync -a --delete \
+	    --exclude='check_config.h' \
+	    --exclude='compat-1.3.h' \
+	    --exclude='config.h' \
+	    --exclude='error.h' \
+	    --exclude='version.h' \
+	    $(OLD_CRYPTO_API) $(TARGET_INC)/
 	#
 	# Copying licenses
 	cp $(CRYPTO_DIR)/LICENSE $(TARGET_PREFIX)/