feat(mbedtls): Redefine mbedtls file structure

2025-08-06 07:00:05 +08:00 · 2018-04-19 18:40:59 +08:00
parent df79ccfe8f
commit 8b3fb84266
141 changed files with 5 additions and 5 deletions
--- a/components/ssl/Makefile.projbuild
+++ b/components/ssl/Makefile.projbuild
@ -2,5 +2,5 @@
 # alternative config file

 #ifdef CONFIG_SSL_USING_MBEDTLS
-CPPFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/config_esp.h"'
+CPPFLAGS += -DMBEDTLS_CONFIG_FILE='"config_esp.h"'
 #endif
--- a/components/ssl/component.mk
+++ b/components/ssl/component.mk
@ -8,9 +8,9 @@ COMPONENT_PRIV_INCLUDEDIRS := openssl/include/internal openssl/include/openssl o

 COMPONENT_SRCDIRS := openssl/source/library openssl/source/platform

-COMPONENT_ADD_INCLUDEDIRS += mbedtls/include
-COMPONENT_SRCDIRS += mbedtls/source/library mbedtls/source/platform
+COMPONENT_ADD_INCLUDEDIRS += mbedtls/mbedtls/include mbedtls/port/include
+COMPONENT_SRCDIRS += mbedtls/mbedtls/library mbedtls/port
 else
 COMPONENT_ADD_INCLUDEDIRS := axtls/include
 COMPONENT_SRCDIRS := axtls/source/ssl axtls/source/crypto
-endif
+endif
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/aes.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/aes.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/aesni.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/aesni.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/arc4.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/arc4.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/asn1.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/asn1.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/asn1write.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/asn1write.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/base64.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/base64.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/bignum.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/bignum.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/blowfish.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/blowfish.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/bn_mul.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/bn_mul.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/camellia.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/camellia.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ccm.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ccm.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/certs.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/certs.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/check_config.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/check_config.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/cipher.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/cipher.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/cipher_internal.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/cipher_internal.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/compat-1.3.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/compat-1.3.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/config.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/config.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ctr_drbg.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ctr_drbg.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/debug.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/debug.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/des.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/des.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/dhm.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/dhm.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ecdh.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ecdh.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ecdsa.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ecdsa.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ecjpake.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ecjpake.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ecp.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ecp.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/entropy.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/entropy.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/entropy_poll.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/entropy_poll.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/error.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/error.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/gcm.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/gcm.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/havege.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/havege.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/hmac_drbg.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/hmac_drbg.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/md.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/md.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/md2.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/md2.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/md4.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/md4.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/md5.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/md5.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/md_internal.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/md_internal.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/memory_buffer_alloc.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/memory_buffer_alloc.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/net.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/net.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/oid.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/oid.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/padlock.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/padlock.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/pem.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/pem.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/pk.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/pk.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/pk_internal.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/pk_internal.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/pkcs11.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/pkcs11.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/pkcs12.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/pkcs12.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/pkcs5.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/pkcs5.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/platform.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/platform.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ripemd160.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ripemd160.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/rsa.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/rsa.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/sha1.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/sha1.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/sha256.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/sha256.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/sha512.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/sha512.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_cache.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_cache.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_ciphersuites.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_ciphersuites.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_cookie.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_cookie.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_internal.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_internal.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_ticket.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/ssl_ticket.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/threading.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/threading.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/timing.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/timing.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/version.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/version.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/x509.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/x509.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/x509_crl.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/x509_crl.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/x509_crt.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/x509_crt.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/x509_csr.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/x509_csr.h
--- a/components/ssl/mbedtls/mbedtls/include/mbedtls/xtea.h
+++ b/components/ssl/mbedtls/mbedtls/include/mbedtls/xtea.h
--- a/components/ssl/mbedtls/mbedtls/library/aes.c
+++ b/components/ssl/mbedtls/mbedtls/library/aes.c
--- a/components/ssl/mbedtls/mbedtls/library/aesni.c
+++ b/components/ssl/mbedtls/mbedtls/library/aesni.c
--- a/components/ssl/mbedtls/mbedtls/library/arc4.c
+++ b/components/ssl/mbedtls/mbedtls/library/arc4.c
--- a/components/ssl/mbedtls/mbedtls/library/asn1parse.c
+++ b/components/ssl/mbedtls/mbedtls/library/asn1parse.c
--- a/components/ssl/mbedtls/mbedtls/library/asn1write.c
+++ b/components/ssl/mbedtls/mbedtls/library/asn1write.c
--- a/components/ssl/mbedtls/mbedtls/library/base64.c
+++ b/components/ssl/mbedtls/mbedtls/library/base64.c
--- a/components/ssl/mbedtls/mbedtls/library/bignum.c
+++ b/components/ssl/mbedtls/mbedtls/library/bignum.c
--- a/components/ssl/mbedtls/mbedtls/library/blowfish.c
+++ b/components/ssl/mbedtls/mbedtls/library/blowfish.c
--- a/components/ssl/mbedtls/mbedtls/library/camellia.c
+++ b/components/ssl/mbedtls/mbedtls/library/camellia.c
--- a/components/ssl/mbedtls/mbedtls/library/ccm.c
+++ b/components/ssl/mbedtls/mbedtls/library/ccm.c
--- a/components/ssl/mbedtls/mbedtls/library/certs.c
+++ b/components/ssl/mbedtls/mbedtls/library/certs.c
--- a/components/ssl/mbedtls/mbedtls/library/cipher.c
+++ b/components/ssl/mbedtls/mbedtls/library/cipher.c
--- a/components/ssl/mbedtls/mbedtls/library/cipher_wrap.c
+++ b/components/ssl/mbedtls/mbedtls/library/cipher_wrap.c
--- a/components/ssl/mbedtls/mbedtls/library/ctr_drbg.c
+++ b/components/ssl/mbedtls/mbedtls/library/ctr_drbg.c
--- a/components/ssl/mbedtls/mbedtls/library/debug.c
+++ b/components/ssl/mbedtls/mbedtls/library/debug.c
--- a/components/ssl/mbedtls/mbedtls/library/des.c
+++ b/components/ssl/mbedtls/mbedtls/library/des.c
--- a/components/ssl/mbedtls/mbedtls/library/dhm.c
+++ b/components/ssl/mbedtls/mbedtls/library/dhm.c
--- a/components/ssl/mbedtls/mbedtls/library/ecdh.c
+++ b/components/ssl/mbedtls/mbedtls/library/ecdh.c
--- a/components/ssl/mbedtls/mbedtls/library/ecdsa.c
+++ b/components/ssl/mbedtls/mbedtls/library/ecdsa.c
--- a/components/ssl/mbedtls/mbedtls/library/ecjpake.c
+++ b/components/ssl/mbedtls/mbedtls/library/ecjpake.c
--- a/components/ssl/mbedtls/mbedtls/library/ecp.c
+++ b/components/ssl/mbedtls/mbedtls/library/ecp.c
--- a/components/ssl/mbedtls/mbedtls/library/ecp_curves.c
+++ b/components/ssl/mbedtls/mbedtls/library/ecp_curves.c
--- a/components/ssl/mbedtls/mbedtls/library/entropy.c
+++ b/components/ssl/mbedtls/mbedtls/library/entropy.c
--- a/components/ssl/mbedtls/mbedtls/library/entropy_poll.c
+++ b/components/ssl/mbedtls/mbedtls/library/entropy_poll.c
--- a/components/ssl/mbedtls/mbedtls/library/error.c
+++ b/components/ssl/mbedtls/mbedtls/library/error.c
--- a/components/ssl/mbedtls/mbedtls/library/gcm.c
+++ b/components/ssl/mbedtls/mbedtls/library/gcm.c
--- a/components/ssl/mbedtls/mbedtls/library/havege.c
+++ b/components/ssl/mbedtls/mbedtls/library/havege.c
--- a/components/ssl/mbedtls/mbedtls/library/hmac_drbg.c
+++ b/components/ssl/mbedtls/mbedtls/library/hmac_drbg.c
--- a/components/ssl/mbedtls/mbedtls/library/md.c
+++ b/components/ssl/mbedtls/mbedtls/library/md.c
--- a/components/ssl/mbedtls/mbedtls/library/md2.c
+++ b/components/ssl/mbedtls/mbedtls/library/md2.c
--- a/components/ssl/mbedtls/mbedtls/library/md4.c
+++ b/components/ssl/mbedtls/mbedtls/library/md4.c
--- a/components/ssl/mbedtls/mbedtls/library/md5.c
+++ b/components/ssl/mbedtls/mbedtls/library/md5.c
--- a/Show More
+++ b/Show More