diff --git a/components/axtls/component.mk b/components/axtls/component.mk deleted file mode 100644 index e3d8fbb3..00000000 --- a/components/axtls/component.mk +++ /dev/null @@ -1,6 +0,0 @@ -# -# Component Makefile -# -COMPONENT_ADD_INCLUDEDIRS += include/ssl - -COMPONENT_SRCDIRS := source/ssl source/crypto diff --git a/components/mbedtls/component.mk b/components/mbedtls/component.mk deleted file mode 100644 index f6b10892..00000000 --- a/components/mbedtls/component.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# Component Makefile -# -COMPONENT_ADD_INCLUDEDIRS += include/mbedtls - -COMPONENT_SRCDIRS += source/library source/platform - -CFLAGS += -DMBEDTLS_CONFIG_FILE='"config_esp.h"' diff --git a/components/openssl/component.mk b/components/openssl/component.mk deleted file mode 100644 index 0288cc0b..00000000 --- a/components/openssl/component.mk +++ /dev/null @@ -1,6 +0,0 @@ -# -# Component Makefile -# -COMPONENT_ADD_INCLUDEDIRS += include/openssl include/internal include/platform - -COMPONENT_SRCDIRS := source/library source/platform diff --git a/components/ssl/Kconfig b/components/ssl/Kconfig new file mode 100644 index 00000000..ee445c7c --- /dev/null +++ b/components/ssl/Kconfig @@ -0,0 +1,17 @@ +menu "SSL" + +choice SSL_LIBRARY_CHOOSE + prompt "Choose SSL/TLS library" + default SSL_USING_MBEDTLS + help + Choose the SSL/TLS library which you want to use. + + Currently we support mbedTLS and axTLS. + +config SSL_USING_MBEDTLS + bool "mbedTLS" +config SSL_USING_AXTLS + bool "axTLS" +endchoice + +endmenu diff --git a/components/ssl/Makefile.projbuild b/components/ssl/Makefile.projbuild new file mode 100644 index 00000000..4e202f54 --- /dev/null +++ b/components/ssl/Makefile.projbuild @@ -0,0 +1,6 @@ +# Anyone compiling mbedTLS code needs the name of the +# alternative config file + +#ifdef CONFIG_SSL_USING_MBEDTLS +CPPFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/config_esp.h"' +#endif diff --git a/components/axtls/include/ssl/ssl_bigint.h b/components/ssl/axtls/include/ssl/ssl_bigint.h similarity index 100% rename from components/axtls/include/ssl/ssl_bigint.h rename to components/ssl/axtls/include/ssl/ssl_bigint.h diff --git a/components/axtls/include/ssl/ssl_bigint_impl.h b/components/ssl/axtls/include/ssl/ssl_bigint_impl.h similarity index 100% rename from components/axtls/include/ssl/ssl_bigint_impl.h rename to components/ssl/axtls/include/ssl/ssl_bigint_impl.h diff --git a/components/axtls/include/ssl/ssl_compat-1.0.h b/components/ssl/axtls/include/ssl/ssl_compat-1.0.h similarity index 100% rename from components/axtls/include/ssl/ssl_compat-1.0.h rename to components/ssl/axtls/include/ssl/ssl_compat-1.0.h diff --git a/components/axtls/include/ssl/ssl_config.h b/components/ssl/axtls/include/ssl/ssl_config.h similarity index 100% rename from components/axtls/include/ssl/ssl_config.h rename to components/ssl/axtls/include/ssl/ssl_config.h diff --git a/components/axtls/include/ssl/ssl_crypto.h b/components/ssl/axtls/include/ssl/ssl_crypto.h similarity index 100% rename from components/axtls/include/ssl/ssl_crypto.h rename to components/ssl/axtls/include/ssl/ssl_crypto.h diff --git a/components/axtls/include/ssl/ssl_crypto_misc.h b/components/ssl/axtls/include/ssl/ssl_crypto_misc.h similarity index 100% rename from components/axtls/include/ssl/ssl_crypto_misc.h rename to components/ssl/axtls/include/ssl/ssl_crypto_misc.h diff --git a/components/axtls/include/ssl/ssl_os_port.h b/components/ssl/axtls/include/ssl/ssl_os_port.h similarity index 100% rename from components/axtls/include/ssl/ssl_os_port.h rename to components/ssl/axtls/include/ssl/ssl_os_port.h diff --git a/components/axtls/include/ssl/ssl_platform.h b/components/ssl/axtls/include/ssl/ssl_platform.h similarity index 100% rename from components/axtls/include/ssl/ssl_platform.h rename to components/ssl/axtls/include/ssl/ssl_platform.h diff --git a/components/axtls/include/ssl/ssl_ssl.h b/components/ssl/axtls/include/ssl/ssl_ssl.h similarity index 100% rename from components/axtls/include/ssl/ssl_ssl.h rename to components/ssl/axtls/include/ssl/ssl_ssl.h diff --git a/components/axtls/include/ssl/ssl_tls1.h b/components/ssl/axtls/include/ssl/ssl_tls1.h similarity index 100% rename from components/axtls/include/ssl/ssl_tls1.h rename to components/ssl/axtls/include/ssl/ssl_tls1.h diff --git a/components/axtls/include/ssl/ssl_version.h b/components/ssl/axtls/include/ssl/ssl_version.h similarity index 100% rename from components/axtls/include/ssl/ssl_version.h rename to components/ssl/axtls/include/ssl/ssl_version.h diff --git a/components/axtls/source/crypto/sha256.c b/components/ssl/axtls/source/crypto/sha256.c similarity index 100% rename from components/axtls/source/crypto/sha256.c rename to components/ssl/axtls/source/crypto/sha256.c diff --git a/components/axtls/source/crypto/sha384.c b/components/ssl/axtls/source/crypto/sha384.c similarity index 100% rename from components/axtls/source/crypto/sha384.c rename to components/ssl/axtls/source/crypto/sha384.c diff --git a/components/axtls/source/crypto/sha512.c b/components/ssl/axtls/source/crypto/sha512.c similarity index 100% rename from components/axtls/source/crypto/sha512.c rename to components/ssl/axtls/source/crypto/sha512.c diff --git a/components/axtls/source/crypto/ssl_aes.c b/components/ssl/axtls/source/crypto/ssl_aes.c similarity index 100% rename from components/axtls/source/crypto/ssl_aes.c rename to components/ssl/axtls/source/crypto/ssl_aes.c diff --git a/components/axtls/source/crypto/ssl_bigint.c b/components/ssl/axtls/source/crypto/ssl_bigint.c similarity index 100% rename from components/axtls/source/crypto/ssl_bigint.c rename to components/ssl/axtls/source/crypto/ssl_bigint.c diff --git a/components/axtls/source/crypto/ssl_crypto_misc.c b/components/ssl/axtls/source/crypto/ssl_crypto_misc.c similarity index 100% rename from components/axtls/source/crypto/ssl_crypto_misc.c rename to components/ssl/axtls/source/crypto/ssl_crypto_misc.c diff --git a/components/axtls/source/crypto/ssl_hmac.c b/components/ssl/axtls/source/crypto/ssl_hmac.c similarity index 100% rename from components/axtls/source/crypto/ssl_hmac.c rename to components/ssl/axtls/source/crypto/ssl_hmac.c diff --git a/components/axtls/source/crypto/ssl_md5.c b/components/ssl/axtls/source/crypto/ssl_md5.c similarity index 100% rename from components/axtls/source/crypto/ssl_md5.c rename to components/ssl/axtls/source/crypto/ssl_md5.c diff --git a/components/axtls/source/crypto/ssl_rc4.c b/components/ssl/axtls/source/crypto/ssl_rc4.c similarity index 100% rename from components/axtls/source/crypto/ssl_rc4.c rename to components/ssl/axtls/source/crypto/ssl_rc4.c diff --git a/components/axtls/source/crypto/ssl_rsa.c b/components/ssl/axtls/source/crypto/ssl_rsa.c similarity index 100% rename from components/axtls/source/crypto/ssl_rsa.c rename to components/ssl/axtls/source/crypto/ssl_rsa.c diff --git a/components/axtls/source/crypto/ssl_sha1.c b/components/ssl/axtls/source/crypto/ssl_sha1.c similarity index 100% rename from components/axtls/source/crypto/ssl_sha1.c rename to components/ssl/axtls/source/crypto/ssl_sha1.c diff --git a/components/axtls/source/ssl/ssl_asn1.c b/components/ssl/axtls/source/ssl/ssl_asn1.c similarity index 100% rename from components/axtls/source/ssl/ssl_asn1.c rename to components/ssl/axtls/source/ssl/ssl_asn1.c diff --git a/components/axtls/source/ssl/ssl_gen_cert.c b/components/ssl/axtls/source/ssl/ssl_gen_cert.c similarity index 100% rename from components/axtls/source/ssl/ssl_gen_cert.c rename to components/ssl/axtls/source/ssl/ssl_gen_cert.c diff --git a/components/axtls/source/ssl/ssl_loader.c b/components/ssl/axtls/source/ssl/ssl_loader.c similarity index 100% rename from components/axtls/source/ssl/ssl_loader.c rename to components/ssl/axtls/source/ssl/ssl_loader.c diff --git a/components/axtls/source/ssl/ssl_openssl.c b/components/ssl/axtls/source/ssl/ssl_openssl.c similarity index 100% rename from components/axtls/source/ssl/ssl_openssl.c rename to components/ssl/axtls/source/ssl/ssl_openssl.c diff --git a/components/axtls/source/ssl/ssl_os_port.c b/components/ssl/axtls/source/ssl/ssl_os_port.c similarity index 100% rename from components/axtls/source/ssl/ssl_os_port.c rename to components/ssl/axtls/source/ssl/ssl_os_port.c diff --git a/components/axtls/source/ssl/ssl_p12.c b/components/ssl/axtls/source/ssl/ssl_p12.c similarity index 100% rename from components/axtls/source/ssl/ssl_p12.c rename to components/ssl/axtls/source/ssl/ssl_p12.c diff --git a/components/axtls/source/ssl/ssl_platform.c b/components/ssl/axtls/source/ssl/ssl_platform.c similarity index 100% rename from components/axtls/source/ssl/ssl_platform.c rename to components/ssl/axtls/source/ssl/ssl_platform.c diff --git a/components/axtls/source/ssl/ssl_tls1.c b/components/ssl/axtls/source/ssl/ssl_tls1.c similarity index 100% rename from components/axtls/source/ssl/ssl_tls1.c rename to components/ssl/axtls/source/ssl/ssl_tls1.c diff --git a/components/axtls/source/ssl/ssl_tls1_clnt.c b/components/ssl/axtls/source/ssl/ssl_tls1_clnt.c similarity index 100% rename from components/axtls/source/ssl/ssl_tls1_clnt.c rename to components/ssl/axtls/source/ssl/ssl_tls1_clnt.c diff --git a/components/axtls/source/ssl/ssl_tls1_svr.c b/components/ssl/axtls/source/ssl/ssl_tls1_svr.c similarity index 100% rename from components/axtls/source/ssl/ssl_tls1_svr.c rename to components/ssl/axtls/source/ssl/ssl_tls1_svr.c diff --git a/components/axtls/source/ssl/ssl_x509.c b/components/ssl/axtls/source/ssl/ssl_x509.c similarity index 100% rename from components/axtls/source/ssl/ssl_x509.c rename to components/ssl/axtls/source/ssl/ssl_x509.c diff --git a/components/ssl/component.mk b/components/ssl/component.mk new file mode 100644 index 00000000..209bf29f --- /dev/null +++ b/components/ssl/component.mk @@ -0,0 +1,15 @@ +# +# Component Makefile +# +COMPONENT_ADD_INCLUDEDIRS := openssl/include +COMPONENT_PRIV_INCLUDEDIRS := openssl/include/internal openssl/include/openssl openssl/include/platform + +COMPONENT_SRCDIRS := openssl/source/library openssl/source/platform + +ifdef CONFIG_SSL_USING_MBEDTLS +COMPONENT_ADD_INCLUDEDIRS += mbedtls/include +COMPONENT_SRCDIRS += mbedtls/source/library mbedtls/source/platform +else +COMPONENT_ADD_INCLUDEDIRS += axtls/include +COMPONENT_SRCDIRS += axtls/source/ssl axtls/source/crypto +endif \ No newline at end of file diff --git a/components/mbedtls/include/mbedtls/aes.h b/components/ssl/mbedtls/include/mbedtls/aes.h similarity index 100% rename from components/mbedtls/include/mbedtls/aes.h rename to components/ssl/mbedtls/include/mbedtls/aes.h diff --git a/components/mbedtls/include/mbedtls/aesni.h b/components/ssl/mbedtls/include/mbedtls/aesni.h similarity index 100% rename from components/mbedtls/include/mbedtls/aesni.h rename to components/ssl/mbedtls/include/mbedtls/aesni.h diff --git a/components/mbedtls/include/mbedtls/arc4.h b/components/ssl/mbedtls/include/mbedtls/arc4.h similarity index 100% rename from components/mbedtls/include/mbedtls/arc4.h rename to components/ssl/mbedtls/include/mbedtls/arc4.h diff --git a/components/mbedtls/include/mbedtls/asn1.h b/components/ssl/mbedtls/include/mbedtls/asn1.h similarity index 100% rename from components/mbedtls/include/mbedtls/asn1.h rename to components/ssl/mbedtls/include/mbedtls/asn1.h diff --git a/components/mbedtls/include/mbedtls/asn1write.h b/components/ssl/mbedtls/include/mbedtls/asn1write.h similarity index 100% rename from components/mbedtls/include/mbedtls/asn1write.h rename to components/ssl/mbedtls/include/mbedtls/asn1write.h diff --git a/components/mbedtls/include/mbedtls/base64.h b/components/ssl/mbedtls/include/mbedtls/base64.h similarity index 100% rename from components/mbedtls/include/mbedtls/base64.h rename to components/ssl/mbedtls/include/mbedtls/base64.h diff --git a/components/mbedtls/include/mbedtls/bignum.h b/components/ssl/mbedtls/include/mbedtls/bignum.h similarity index 100% rename from components/mbedtls/include/mbedtls/bignum.h rename to components/ssl/mbedtls/include/mbedtls/bignum.h diff --git a/components/mbedtls/include/mbedtls/blowfish.h b/components/ssl/mbedtls/include/mbedtls/blowfish.h similarity index 100% rename from components/mbedtls/include/mbedtls/blowfish.h rename to components/ssl/mbedtls/include/mbedtls/blowfish.h diff --git a/components/mbedtls/include/mbedtls/bn_mul.h b/components/ssl/mbedtls/include/mbedtls/bn_mul.h similarity index 100% rename from components/mbedtls/include/mbedtls/bn_mul.h rename to components/ssl/mbedtls/include/mbedtls/bn_mul.h diff --git a/components/mbedtls/include/mbedtls/camellia.h b/components/ssl/mbedtls/include/mbedtls/camellia.h similarity index 100% rename from components/mbedtls/include/mbedtls/camellia.h rename to components/ssl/mbedtls/include/mbedtls/camellia.h diff --git a/components/mbedtls/include/mbedtls/ccm.h b/components/ssl/mbedtls/include/mbedtls/ccm.h similarity index 100% rename from components/mbedtls/include/mbedtls/ccm.h rename to components/ssl/mbedtls/include/mbedtls/ccm.h diff --git a/components/mbedtls/include/mbedtls/certs.h b/components/ssl/mbedtls/include/mbedtls/certs.h similarity index 100% rename from components/mbedtls/include/mbedtls/certs.h rename to components/ssl/mbedtls/include/mbedtls/certs.h diff --git a/components/mbedtls/include/mbedtls/check_config.h b/components/ssl/mbedtls/include/mbedtls/check_config.h similarity index 100% rename from components/mbedtls/include/mbedtls/check_config.h rename to components/ssl/mbedtls/include/mbedtls/check_config.h diff --git a/components/mbedtls/include/mbedtls/cipher.h b/components/ssl/mbedtls/include/mbedtls/cipher.h similarity index 100% rename from components/mbedtls/include/mbedtls/cipher.h rename to components/ssl/mbedtls/include/mbedtls/cipher.h diff --git a/components/mbedtls/include/mbedtls/cipher_internal.h b/components/ssl/mbedtls/include/mbedtls/cipher_internal.h similarity index 100% rename from components/mbedtls/include/mbedtls/cipher_internal.h rename to components/ssl/mbedtls/include/mbedtls/cipher_internal.h diff --git a/components/mbedtls/include/mbedtls/compat-1.3.h b/components/ssl/mbedtls/include/mbedtls/compat-1.3.h similarity index 100% rename from components/mbedtls/include/mbedtls/compat-1.3.h rename to components/ssl/mbedtls/include/mbedtls/compat-1.3.h diff --git a/components/mbedtls/include/mbedtls/config.h b/components/ssl/mbedtls/include/mbedtls/config.h similarity index 100% rename from components/mbedtls/include/mbedtls/config.h rename to components/ssl/mbedtls/include/mbedtls/config.h diff --git a/components/mbedtls/include/mbedtls/config_esp.h b/components/ssl/mbedtls/include/mbedtls/config_esp.h similarity index 100% rename from components/mbedtls/include/mbedtls/config_esp.h rename to components/ssl/mbedtls/include/mbedtls/config_esp.h diff --git a/components/mbedtls/include/mbedtls/ctr_drbg.h b/components/ssl/mbedtls/include/mbedtls/ctr_drbg.h similarity index 100% rename from components/mbedtls/include/mbedtls/ctr_drbg.h rename to components/ssl/mbedtls/include/mbedtls/ctr_drbg.h diff --git a/components/mbedtls/include/mbedtls/debug.h b/components/ssl/mbedtls/include/mbedtls/debug.h similarity index 100% rename from components/mbedtls/include/mbedtls/debug.h rename to components/ssl/mbedtls/include/mbedtls/debug.h diff --git a/components/mbedtls/include/mbedtls/des.h b/components/ssl/mbedtls/include/mbedtls/des.h similarity index 100% rename from components/mbedtls/include/mbedtls/des.h rename to components/ssl/mbedtls/include/mbedtls/des.h diff --git a/components/mbedtls/include/mbedtls/dhm.h b/components/ssl/mbedtls/include/mbedtls/dhm.h similarity index 100% rename from components/mbedtls/include/mbedtls/dhm.h rename to components/ssl/mbedtls/include/mbedtls/dhm.h diff --git a/components/mbedtls/include/mbedtls/ecdh.h b/components/ssl/mbedtls/include/mbedtls/ecdh.h similarity index 100% rename from components/mbedtls/include/mbedtls/ecdh.h rename to components/ssl/mbedtls/include/mbedtls/ecdh.h diff --git a/components/mbedtls/include/mbedtls/ecdsa.h b/components/ssl/mbedtls/include/mbedtls/ecdsa.h similarity index 100% rename from components/mbedtls/include/mbedtls/ecdsa.h rename to components/ssl/mbedtls/include/mbedtls/ecdsa.h diff --git a/components/mbedtls/include/mbedtls/ecjpake.h b/components/ssl/mbedtls/include/mbedtls/ecjpake.h similarity index 100% rename from components/mbedtls/include/mbedtls/ecjpake.h rename to components/ssl/mbedtls/include/mbedtls/ecjpake.h diff --git a/components/mbedtls/include/mbedtls/ecp.h b/components/ssl/mbedtls/include/mbedtls/ecp.h similarity index 100% rename from components/mbedtls/include/mbedtls/ecp.h rename to components/ssl/mbedtls/include/mbedtls/ecp.h diff --git a/components/mbedtls/include/mbedtls/entropy.h b/components/ssl/mbedtls/include/mbedtls/entropy.h similarity index 100% rename from components/mbedtls/include/mbedtls/entropy.h rename to components/ssl/mbedtls/include/mbedtls/entropy.h diff --git a/components/mbedtls/include/mbedtls/entropy_poll.h b/components/ssl/mbedtls/include/mbedtls/entropy_poll.h similarity index 100% rename from components/mbedtls/include/mbedtls/entropy_poll.h rename to components/ssl/mbedtls/include/mbedtls/entropy_poll.h diff --git a/components/mbedtls/include/mbedtls/error.h b/components/ssl/mbedtls/include/mbedtls/error.h similarity index 100% rename from components/mbedtls/include/mbedtls/error.h rename to components/ssl/mbedtls/include/mbedtls/error.h diff --git a/components/mbedtls/include/mbedtls/gcm.h b/components/ssl/mbedtls/include/mbedtls/gcm.h similarity index 100% rename from components/mbedtls/include/mbedtls/gcm.h rename to components/ssl/mbedtls/include/mbedtls/gcm.h diff --git a/components/mbedtls/include/mbedtls/havege.h b/components/ssl/mbedtls/include/mbedtls/havege.h similarity index 100% rename from components/mbedtls/include/mbedtls/havege.h rename to components/ssl/mbedtls/include/mbedtls/havege.h diff --git a/components/mbedtls/include/mbedtls/hmac_drbg.h b/components/ssl/mbedtls/include/mbedtls/hmac_drbg.h similarity index 100% rename from components/mbedtls/include/mbedtls/hmac_drbg.h rename to components/ssl/mbedtls/include/mbedtls/hmac_drbg.h diff --git a/components/mbedtls/include/mbedtls/md.h b/components/ssl/mbedtls/include/mbedtls/md.h similarity index 100% rename from components/mbedtls/include/mbedtls/md.h rename to components/ssl/mbedtls/include/mbedtls/md.h diff --git a/components/mbedtls/include/mbedtls/md2.h b/components/ssl/mbedtls/include/mbedtls/md2.h similarity index 100% rename from components/mbedtls/include/mbedtls/md2.h rename to components/ssl/mbedtls/include/mbedtls/md2.h diff --git a/components/mbedtls/include/mbedtls/md4.h b/components/ssl/mbedtls/include/mbedtls/md4.h similarity index 100% rename from components/mbedtls/include/mbedtls/md4.h rename to components/ssl/mbedtls/include/mbedtls/md4.h diff --git a/components/mbedtls/include/mbedtls/md5.h b/components/ssl/mbedtls/include/mbedtls/md5.h similarity index 100% rename from components/mbedtls/include/mbedtls/md5.h rename to components/ssl/mbedtls/include/mbedtls/md5.h diff --git a/components/mbedtls/include/mbedtls/md_internal.h b/components/ssl/mbedtls/include/mbedtls/md_internal.h similarity index 100% rename from components/mbedtls/include/mbedtls/md_internal.h rename to components/ssl/mbedtls/include/mbedtls/md_internal.h diff --git a/components/mbedtls/include/mbedtls/memory_buffer_alloc.h b/components/ssl/mbedtls/include/mbedtls/memory_buffer_alloc.h similarity index 100% rename from components/mbedtls/include/mbedtls/memory_buffer_alloc.h rename to components/ssl/mbedtls/include/mbedtls/memory_buffer_alloc.h diff --git a/components/mbedtls/include/mbedtls/net.h b/components/ssl/mbedtls/include/mbedtls/net.h similarity index 100% rename from components/mbedtls/include/mbedtls/net.h rename to components/ssl/mbedtls/include/mbedtls/net.h diff --git a/components/mbedtls/include/mbedtls/oid.h b/components/ssl/mbedtls/include/mbedtls/oid.h similarity index 100% rename from components/mbedtls/include/mbedtls/oid.h rename to components/ssl/mbedtls/include/mbedtls/oid.h diff --git a/components/mbedtls/include/mbedtls/padlock.h b/components/ssl/mbedtls/include/mbedtls/padlock.h similarity index 100% rename from components/mbedtls/include/mbedtls/padlock.h rename to components/ssl/mbedtls/include/mbedtls/padlock.h diff --git a/components/mbedtls/include/mbedtls/pem.h b/components/ssl/mbedtls/include/mbedtls/pem.h similarity index 100% rename from components/mbedtls/include/mbedtls/pem.h rename to components/ssl/mbedtls/include/mbedtls/pem.h diff --git a/components/mbedtls/include/mbedtls/pk.h b/components/ssl/mbedtls/include/mbedtls/pk.h similarity index 100% rename from components/mbedtls/include/mbedtls/pk.h rename to components/ssl/mbedtls/include/mbedtls/pk.h diff --git a/components/mbedtls/include/mbedtls/pk_internal.h b/components/ssl/mbedtls/include/mbedtls/pk_internal.h similarity index 100% rename from components/mbedtls/include/mbedtls/pk_internal.h rename to components/ssl/mbedtls/include/mbedtls/pk_internal.h diff --git a/components/mbedtls/include/mbedtls/pkcs11.h b/components/ssl/mbedtls/include/mbedtls/pkcs11.h similarity index 100% rename from components/mbedtls/include/mbedtls/pkcs11.h rename to components/ssl/mbedtls/include/mbedtls/pkcs11.h diff --git a/components/mbedtls/include/mbedtls/pkcs12.h b/components/ssl/mbedtls/include/mbedtls/pkcs12.h similarity index 100% rename from components/mbedtls/include/mbedtls/pkcs12.h rename to components/ssl/mbedtls/include/mbedtls/pkcs12.h diff --git a/components/mbedtls/include/mbedtls/pkcs5.h b/components/ssl/mbedtls/include/mbedtls/pkcs5.h similarity index 100% rename from components/mbedtls/include/mbedtls/pkcs5.h rename to components/ssl/mbedtls/include/mbedtls/pkcs5.h diff --git a/components/mbedtls/include/mbedtls/platform.h b/components/ssl/mbedtls/include/mbedtls/platform.h similarity index 100% rename from components/mbedtls/include/mbedtls/platform.h rename to components/ssl/mbedtls/include/mbedtls/platform.h diff --git a/components/mbedtls/include/mbedtls/ripemd160.h b/components/ssl/mbedtls/include/mbedtls/ripemd160.h similarity index 100% rename from components/mbedtls/include/mbedtls/ripemd160.h rename to components/ssl/mbedtls/include/mbedtls/ripemd160.h diff --git a/components/mbedtls/include/mbedtls/rsa.h b/components/ssl/mbedtls/include/mbedtls/rsa.h similarity index 100% rename from components/mbedtls/include/mbedtls/rsa.h rename to components/ssl/mbedtls/include/mbedtls/rsa.h diff --git a/components/mbedtls/include/mbedtls/sha1.h b/components/ssl/mbedtls/include/mbedtls/sha1.h similarity index 100% rename from components/mbedtls/include/mbedtls/sha1.h rename to components/ssl/mbedtls/include/mbedtls/sha1.h diff --git a/components/mbedtls/include/mbedtls/sha256.h b/components/ssl/mbedtls/include/mbedtls/sha256.h similarity index 100% rename from components/mbedtls/include/mbedtls/sha256.h rename to components/ssl/mbedtls/include/mbedtls/sha256.h diff --git a/components/mbedtls/include/mbedtls/sha512.h b/components/ssl/mbedtls/include/mbedtls/sha512.h similarity index 100% rename from components/mbedtls/include/mbedtls/sha512.h rename to components/ssl/mbedtls/include/mbedtls/sha512.h diff --git a/components/mbedtls/include/mbedtls/ssl.h b/components/ssl/mbedtls/include/mbedtls/ssl.h similarity index 100% rename from components/mbedtls/include/mbedtls/ssl.h rename to components/ssl/mbedtls/include/mbedtls/ssl.h diff --git a/components/mbedtls/include/mbedtls/ssl_cache.h b/components/ssl/mbedtls/include/mbedtls/ssl_cache.h similarity index 100% rename from components/mbedtls/include/mbedtls/ssl_cache.h rename to components/ssl/mbedtls/include/mbedtls/ssl_cache.h diff --git a/components/mbedtls/include/mbedtls/ssl_ciphersuites.h b/components/ssl/mbedtls/include/mbedtls/ssl_ciphersuites.h similarity index 100% rename from components/mbedtls/include/mbedtls/ssl_ciphersuites.h rename to components/ssl/mbedtls/include/mbedtls/ssl_ciphersuites.h diff --git a/components/mbedtls/include/mbedtls/ssl_cookie.h b/components/ssl/mbedtls/include/mbedtls/ssl_cookie.h similarity index 100% rename from components/mbedtls/include/mbedtls/ssl_cookie.h rename to components/ssl/mbedtls/include/mbedtls/ssl_cookie.h diff --git a/components/mbedtls/include/mbedtls/ssl_internal.h b/components/ssl/mbedtls/include/mbedtls/ssl_internal.h similarity index 100% rename from components/mbedtls/include/mbedtls/ssl_internal.h rename to components/ssl/mbedtls/include/mbedtls/ssl_internal.h diff --git a/components/mbedtls/include/mbedtls/ssl_ticket.h b/components/ssl/mbedtls/include/mbedtls/ssl_ticket.h similarity index 100% rename from components/mbedtls/include/mbedtls/ssl_ticket.h rename to components/ssl/mbedtls/include/mbedtls/ssl_ticket.h diff --git a/components/mbedtls/include/mbedtls/threading.h b/components/ssl/mbedtls/include/mbedtls/threading.h similarity index 100% rename from components/mbedtls/include/mbedtls/threading.h rename to components/ssl/mbedtls/include/mbedtls/threading.h diff --git a/components/mbedtls/include/mbedtls/timing.h b/components/ssl/mbedtls/include/mbedtls/timing.h similarity index 100% rename from components/mbedtls/include/mbedtls/timing.h rename to components/ssl/mbedtls/include/mbedtls/timing.h diff --git a/components/mbedtls/include/mbedtls/version.h b/components/ssl/mbedtls/include/mbedtls/version.h similarity index 100% rename from components/mbedtls/include/mbedtls/version.h rename to components/ssl/mbedtls/include/mbedtls/version.h diff --git a/components/mbedtls/include/mbedtls/x509.h b/components/ssl/mbedtls/include/mbedtls/x509.h similarity index 100% rename from components/mbedtls/include/mbedtls/x509.h rename to components/ssl/mbedtls/include/mbedtls/x509.h diff --git a/components/mbedtls/include/mbedtls/x509_crl.h b/components/ssl/mbedtls/include/mbedtls/x509_crl.h similarity index 100% rename from components/mbedtls/include/mbedtls/x509_crl.h rename to components/ssl/mbedtls/include/mbedtls/x509_crl.h diff --git a/components/mbedtls/include/mbedtls/x509_crt.h b/components/ssl/mbedtls/include/mbedtls/x509_crt.h similarity index 100% rename from components/mbedtls/include/mbedtls/x509_crt.h rename to components/ssl/mbedtls/include/mbedtls/x509_crt.h diff --git a/components/mbedtls/include/mbedtls/x509_csr.h b/components/ssl/mbedtls/include/mbedtls/x509_csr.h similarity index 100% rename from components/mbedtls/include/mbedtls/x509_csr.h rename to components/ssl/mbedtls/include/mbedtls/x509_csr.h diff --git a/components/mbedtls/include/mbedtls/xtea.h b/components/ssl/mbedtls/include/mbedtls/xtea.h similarity index 100% rename from components/mbedtls/include/mbedtls/xtea.h rename to components/ssl/mbedtls/include/mbedtls/xtea.h diff --git a/components/mbedtls/source/library/aes.c b/components/ssl/mbedtls/source/library/aes.c similarity index 100% rename from components/mbedtls/source/library/aes.c rename to components/ssl/mbedtls/source/library/aes.c diff --git a/components/mbedtls/source/library/aesni.c b/components/ssl/mbedtls/source/library/aesni.c similarity index 100% rename from components/mbedtls/source/library/aesni.c rename to components/ssl/mbedtls/source/library/aesni.c diff --git a/components/mbedtls/source/library/arc4.c b/components/ssl/mbedtls/source/library/arc4.c similarity index 100% rename from components/mbedtls/source/library/arc4.c rename to components/ssl/mbedtls/source/library/arc4.c diff --git a/components/mbedtls/source/library/asn1parse.c b/components/ssl/mbedtls/source/library/asn1parse.c similarity index 100% rename from components/mbedtls/source/library/asn1parse.c rename to components/ssl/mbedtls/source/library/asn1parse.c diff --git a/components/mbedtls/source/library/asn1write.c b/components/ssl/mbedtls/source/library/asn1write.c similarity index 100% rename from components/mbedtls/source/library/asn1write.c rename to components/ssl/mbedtls/source/library/asn1write.c diff --git a/components/mbedtls/source/library/base64.c b/components/ssl/mbedtls/source/library/base64.c similarity index 100% rename from components/mbedtls/source/library/base64.c rename to components/ssl/mbedtls/source/library/base64.c diff --git a/components/mbedtls/source/library/bignum.c b/components/ssl/mbedtls/source/library/bignum.c similarity index 100% rename from components/mbedtls/source/library/bignum.c rename to components/ssl/mbedtls/source/library/bignum.c diff --git a/components/mbedtls/source/library/blowfish.c b/components/ssl/mbedtls/source/library/blowfish.c similarity index 100% rename from components/mbedtls/source/library/blowfish.c rename to components/ssl/mbedtls/source/library/blowfish.c diff --git a/components/mbedtls/source/library/camellia.c b/components/ssl/mbedtls/source/library/camellia.c similarity index 100% rename from components/mbedtls/source/library/camellia.c rename to components/ssl/mbedtls/source/library/camellia.c diff --git a/components/mbedtls/source/library/ccm.c b/components/ssl/mbedtls/source/library/ccm.c similarity index 100% rename from components/mbedtls/source/library/ccm.c rename to components/ssl/mbedtls/source/library/ccm.c diff --git a/components/mbedtls/source/library/certs.c b/components/ssl/mbedtls/source/library/certs.c similarity index 100% rename from components/mbedtls/source/library/certs.c rename to components/ssl/mbedtls/source/library/certs.c diff --git a/components/mbedtls/source/library/cipher.c b/components/ssl/mbedtls/source/library/cipher.c similarity index 100% rename from components/mbedtls/source/library/cipher.c rename to components/ssl/mbedtls/source/library/cipher.c diff --git a/components/mbedtls/source/library/cipher_wrap.c b/components/ssl/mbedtls/source/library/cipher_wrap.c similarity index 100% rename from components/mbedtls/source/library/cipher_wrap.c rename to components/ssl/mbedtls/source/library/cipher_wrap.c diff --git a/components/mbedtls/source/library/ctr_drbg.c b/components/ssl/mbedtls/source/library/ctr_drbg.c similarity index 100% rename from components/mbedtls/source/library/ctr_drbg.c rename to components/ssl/mbedtls/source/library/ctr_drbg.c diff --git a/components/mbedtls/source/library/debug.c b/components/ssl/mbedtls/source/library/debug.c similarity index 100% rename from components/mbedtls/source/library/debug.c rename to components/ssl/mbedtls/source/library/debug.c diff --git a/components/mbedtls/source/library/des.c b/components/ssl/mbedtls/source/library/des.c similarity index 100% rename from components/mbedtls/source/library/des.c rename to components/ssl/mbedtls/source/library/des.c diff --git a/components/mbedtls/source/library/dhm.c b/components/ssl/mbedtls/source/library/dhm.c similarity index 100% rename from components/mbedtls/source/library/dhm.c rename to components/ssl/mbedtls/source/library/dhm.c diff --git a/components/mbedtls/source/library/ecdh.c b/components/ssl/mbedtls/source/library/ecdh.c similarity index 100% rename from components/mbedtls/source/library/ecdh.c rename to components/ssl/mbedtls/source/library/ecdh.c diff --git a/components/mbedtls/source/library/ecdsa.c b/components/ssl/mbedtls/source/library/ecdsa.c similarity index 100% rename from components/mbedtls/source/library/ecdsa.c rename to components/ssl/mbedtls/source/library/ecdsa.c diff --git a/components/mbedtls/source/library/ecjpake.c b/components/ssl/mbedtls/source/library/ecjpake.c similarity index 100% rename from components/mbedtls/source/library/ecjpake.c rename to components/ssl/mbedtls/source/library/ecjpake.c diff --git a/components/mbedtls/source/library/ecp.c b/components/ssl/mbedtls/source/library/ecp.c similarity index 100% rename from components/mbedtls/source/library/ecp.c rename to components/ssl/mbedtls/source/library/ecp.c diff --git a/components/mbedtls/source/library/ecp_curves.c b/components/ssl/mbedtls/source/library/ecp_curves.c similarity index 100% rename from components/mbedtls/source/library/ecp_curves.c rename to components/ssl/mbedtls/source/library/ecp_curves.c diff --git a/components/mbedtls/source/library/entropy.c b/components/ssl/mbedtls/source/library/entropy.c similarity index 100% rename from components/mbedtls/source/library/entropy.c rename to components/ssl/mbedtls/source/library/entropy.c diff --git a/components/mbedtls/source/library/entropy_poll.c b/components/ssl/mbedtls/source/library/entropy_poll.c similarity index 100% rename from components/mbedtls/source/library/entropy_poll.c rename to components/ssl/mbedtls/source/library/entropy_poll.c diff --git a/components/mbedtls/source/library/error.c b/components/ssl/mbedtls/source/library/error.c similarity index 100% rename from components/mbedtls/source/library/error.c rename to components/ssl/mbedtls/source/library/error.c diff --git a/components/mbedtls/source/library/gcm.c b/components/ssl/mbedtls/source/library/gcm.c similarity index 100% rename from components/mbedtls/source/library/gcm.c rename to components/ssl/mbedtls/source/library/gcm.c diff --git a/components/mbedtls/source/library/havege.c b/components/ssl/mbedtls/source/library/havege.c similarity index 100% rename from components/mbedtls/source/library/havege.c rename to components/ssl/mbedtls/source/library/havege.c diff --git a/components/mbedtls/source/library/hmac_drbg.c b/components/ssl/mbedtls/source/library/hmac_drbg.c similarity index 100% rename from components/mbedtls/source/library/hmac_drbg.c rename to components/ssl/mbedtls/source/library/hmac_drbg.c diff --git a/components/mbedtls/source/library/md.c b/components/ssl/mbedtls/source/library/md.c similarity index 100% rename from components/mbedtls/source/library/md.c rename to components/ssl/mbedtls/source/library/md.c diff --git a/components/mbedtls/source/library/md2.c b/components/ssl/mbedtls/source/library/md2.c similarity index 100% rename from components/mbedtls/source/library/md2.c rename to components/ssl/mbedtls/source/library/md2.c diff --git a/components/mbedtls/source/library/md4.c b/components/ssl/mbedtls/source/library/md4.c similarity index 100% rename from components/mbedtls/source/library/md4.c rename to components/ssl/mbedtls/source/library/md4.c diff --git a/components/mbedtls/source/library/md5.c b/components/ssl/mbedtls/source/library/md5.c similarity index 100% rename from components/mbedtls/source/library/md5.c rename to components/ssl/mbedtls/source/library/md5.c diff --git a/components/mbedtls/source/library/md_wrap.c b/components/ssl/mbedtls/source/library/md_wrap.c similarity index 100% rename from components/mbedtls/source/library/md_wrap.c rename to components/ssl/mbedtls/source/library/md_wrap.c diff --git a/components/mbedtls/source/library/memory_buffer_alloc.c b/components/ssl/mbedtls/source/library/memory_buffer_alloc.c similarity index 100% rename from components/mbedtls/source/library/memory_buffer_alloc.c rename to components/ssl/mbedtls/source/library/memory_buffer_alloc.c diff --git a/components/mbedtls/source/library/net.c b/components/ssl/mbedtls/source/library/net.c similarity index 100% rename from components/mbedtls/source/library/net.c rename to components/ssl/mbedtls/source/library/net.c diff --git a/components/mbedtls/source/library/oid.c b/components/ssl/mbedtls/source/library/oid.c similarity index 100% rename from components/mbedtls/source/library/oid.c rename to components/ssl/mbedtls/source/library/oid.c diff --git a/components/mbedtls/source/library/padlock.c b/components/ssl/mbedtls/source/library/padlock.c similarity index 100% rename from components/mbedtls/source/library/padlock.c rename to components/ssl/mbedtls/source/library/padlock.c diff --git a/components/mbedtls/source/library/pem.c b/components/ssl/mbedtls/source/library/pem.c similarity index 100% rename from components/mbedtls/source/library/pem.c rename to components/ssl/mbedtls/source/library/pem.c diff --git a/components/mbedtls/source/library/pk.c b/components/ssl/mbedtls/source/library/pk.c similarity index 100% rename from components/mbedtls/source/library/pk.c rename to components/ssl/mbedtls/source/library/pk.c diff --git a/components/mbedtls/source/library/pk_wrap.c b/components/ssl/mbedtls/source/library/pk_wrap.c similarity index 100% rename from components/mbedtls/source/library/pk_wrap.c rename to components/ssl/mbedtls/source/library/pk_wrap.c diff --git a/components/mbedtls/source/library/pkcs11.c b/components/ssl/mbedtls/source/library/pkcs11.c similarity index 100% rename from components/mbedtls/source/library/pkcs11.c rename to components/ssl/mbedtls/source/library/pkcs11.c diff --git a/components/mbedtls/source/library/pkcs12.c b/components/ssl/mbedtls/source/library/pkcs12.c similarity index 100% rename from components/mbedtls/source/library/pkcs12.c rename to components/ssl/mbedtls/source/library/pkcs12.c diff --git a/components/mbedtls/source/library/pkcs5.c b/components/ssl/mbedtls/source/library/pkcs5.c similarity index 100% rename from components/mbedtls/source/library/pkcs5.c rename to components/ssl/mbedtls/source/library/pkcs5.c diff --git a/components/mbedtls/source/library/pkparse.c b/components/ssl/mbedtls/source/library/pkparse.c similarity index 100% rename from components/mbedtls/source/library/pkparse.c rename to components/ssl/mbedtls/source/library/pkparse.c diff --git a/components/mbedtls/source/library/pkwrite.c b/components/ssl/mbedtls/source/library/pkwrite.c similarity index 100% rename from components/mbedtls/source/library/pkwrite.c rename to components/ssl/mbedtls/source/library/pkwrite.c diff --git a/components/mbedtls/source/library/platform.c b/components/ssl/mbedtls/source/library/platform.c similarity index 100% rename from components/mbedtls/source/library/platform.c rename to components/ssl/mbedtls/source/library/platform.c diff --git a/components/mbedtls/source/library/ripemd160.c b/components/ssl/mbedtls/source/library/ripemd160.c similarity index 100% rename from components/mbedtls/source/library/ripemd160.c rename to components/ssl/mbedtls/source/library/ripemd160.c diff --git a/components/mbedtls/source/library/rsa.c b/components/ssl/mbedtls/source/library/rsa.c similarity index 100% rename from components/mbedtls/source/library/rsa.c rename to components/ssl/mbedtls/source/library/rsa.c diff --git a/components/mbedtls/source/library/sha1.c b/components/ssl/mbedtls/source/library/sha1.c similarity index 100% rename from components/mbedtls/source/library/sha1.c rename to components/ssl/mbedtls/source/library/sha1.c diff --git a/components/mbedtls/source/library/sha256.c b/components/ssl/mbedtls/source/library/sha256.c similarity index 100% rename from components/mbedtls/source/library/sha256.c rename to components/ssl/mbedtls/source/library/sha256.c diff --git a/components/mbedtls/source/library/sha512.c b/components/ssl/mbedtls/source/library/sha512.c similarity index 100% rename from components/mbedtls/source/library/sha512.c rename to components/ssl/mbedtls/source/library/sha512.c diff --git a/components/mbedtls/source/library/ssl_cache.c b/components/ssl/mbedtls/source/library/ssl_cache.c similarity index 100% rename from components/mbedtls/source/library/ssl_cache.c rename to components/ssl/mbedtls/source/library/ssl_cache.c diff --git a/components/mbedtls/source/library/ssl_ciphersuites.c b/components/ssl/mbedtls/source/library/ssl_ciphersuites.c similarity index 100% rename from components/mbedtls/source/library/ssl_ciphersuites.c rename to components/ssl/mbedtls/source/library/ssl_ciphersuites.c diff --git a/components/mbedtls/source/library/ssl_cli.c b/components/ssl/mbedtls/source/library/ssl_cli.c similarity index 100% rename from components/mbedtls/source/library/ssl_cli.c rename to components/ssl/mbedtls/source/library/ssl_cli.c diff --git a/components/mbedtls/source/library/ssl_cookie.c b/components/ssl/mbedtls/source/library/ssl_cookie.c similarity index 100% rename from components/mbedtls/source/library/ssl_cookie.c rename to components/ssl/mbedtls/source/library/ssl_cookie.c diff --git a/components/mbedtls/source/library/ssl_srv.c b/components/ssl/mbedtls/source/library/ssl_srv.c similarity index 100% rename from components/mbedtls/source/library/ssl_srv.c rename to components/ssl/mbedtls/source/library/ssl_srv.c diff --git a/components/mbedtls/source/library/ssl_ticket.c b/components/ssl/mbedtls/source/library/ssl_ticket.c similarity index 100% rename from components/mbedtls/source/library/ssl_ticket.c rename to components/ssl/mbedtls/source/library/ssl_ticket.c diff --git a/components/mbedtls/source/library/ssl_tls.c b/components/ssl/mbedtls/source/library/ssl_tls.c similarity index 100% rename from components/mbedtls/source/library/ssl_tls.c rename to components/ssl/mbedtls/source/library/ssl_tls.c diff --git a/components/mbedtls/source/library/threading.c b/components/ssl/mbedtls/source/library/threading.c similarity index 100% rename from components/mbedtls/source/library/threading.c rename to components/ssl/mbedtls/source/library/threading.c diff --git a/components/mbedtls/source/library/timing.c b/components/ssl/mbedtls/source/library/timing.c similarity index 100% rename from components/mbedtls/source/library/timing.c rename to components/ssl/mbedtls/source/library/timing.c diff --git a/components/mbedtls/source/library/version.c b/components/ssl/mbedtls/source/library/version.c similarity index 100% rename from components/mbedtls/source/library/version.c rename to components/ssl/mbedtls/source/library/version.c diff --git a/components/mbedtls/source/library/version_features.c b/components/ssl/mbedtls/source/library/version_features.c similarity index 100% rename from components/mbedtls/source/library/version_features.c rename to components/ssl/mbedtls/source/library/version_features.c diff --git a/components/mbedtls/source/library/x509.c b/components/ssl/mbedtls/source/library/x509.c similarity index 100% rename from components/mbedtls/source/library/x509.c rename to components/ssl/mbedtls/source/library/x509.c diff --git a/components/mbedtls/source/library/x509_create.c b/components/ssl/mbedtls/source/library/x509_create.c similarity index 100% rename from components/mbedtls/source/library/x509_create.c rename to components/ssl/mbedtls/source/library/x509_create.c diff --git a/components/mbedtls/source/library/x509_crl.c b/components/ssl/mbedtls/source/library/x509_crl.c similarity index 100% rename from components/mbedtls/source/library/x509_crl.c rename to components/ssl/mbedtls/source/library/x509_crl.c diff --git a/components/mbedtls/source/library/x509_crt.c b/components/ssl/mbedtls/source/library/x509_crt.c similarity index 100% rename from components/mbedtls/source/library/x509_crt.c rename to components/ssl/mbedtls/source/library/x509_crt.c diff --git a/components/mbedtls/source/library/x509_csr.c b/components/ssl/mbedtls/source/library/x509_csr.c similarity index 100% rename from components/mbedtls/source/library/x509_csr.c rename to components/ssl/mbedtls/source/library/x509_csr.c diff --git a/components/mbedtls/source/library/x509write_crt.c b/components/ssl/mbedtls/source/library/x509write_crt.c similarity index 100% rename from components/mbedtls/source/library/x509write_crt.c rename to components/ssl/mbedtls/source/library/x509write_crt.c diff --git a/components/mbedtls/source/library/x509write_csr.c b/components/ssl/mbedtls/source/library/x509write_csr.c similarity index 100% rename from components/mbedtls/source/library/x509write_csr.c rename to components/ssl/mbedtls/source/library/x509write_csr.c diff --git a/components/mbedtls/source/library/xtea.c b/components/ssl/mbedtls/source/library/xtea.c similarity index 100% rename from components/mbedtls/source/library/xtea.c rename to components/ssl/mbedtls/source/library/xtea.c diff --git a/components/mbedtls/source/platform/esp_hardware.c b/components/ssl/mbedtls/source/platform/esp_hardware.c similarity index 100% rename from components/mbedtls/source/platform/esp_hardware.c rename to components/ssl/mbedtls/source/platform/esp_hardware.c diff --git a/components/mbedtls/source/platform/net.c b/components/ssl/mbedtls/source/platform/net.c similarity index 100% rename from components/mbedtls/source/platform/net.c rename to components/ssl/mbedtls/source/platform/net.c diff --git a/components/openssl/OpenSSL-APIs.rst b/components/ssl/openssl/OpenSSL-APIs.rst similarity index 100% rename from components/openssl/OpenSSL-APIs.rst rename to components/ssl/openssl/OpenSSL-APIs.rst diff --git a/components/openssl/include/internal/ssl3.h b/components/ssl/openssl/include/internal/ssl3.h similarity index 100% rename from components/openssl/include/internal/ssl3.h rename to components/ssl/openssl/include/internal/ssl3.h diff --git a/components/openssl/include/internal/ssl_cert.h b/components/ssl/openssl/include/internal/ssl_cert.h similarity index 100% rename from components/openssl/include/internal/ssl_cert.h rename to components/ssl/openssl/include/internal/ssl_cert.h diff --git a/components/openssl/include/internal/ssl_code.h b/components/ssl/openssl/include/internal/ssl_code.h similarity index 100% rename from components/openssl/include/internal/ssl_code.h rename to components/ssl/openssl/include/internal/ssl_code.h diff --git a/components/openssl/include/internal/ssl_dbg.h b/components/ssl/openssl/include/internal/ssl_dbg.h similarity index 100% rename from components/openssl/include/internal/ssl_dbg.h rename to components/ssl/openssl/include/internal/ssl_dbg.h diff --git a/components/openssl/include/internal/ssl_lib.h b/components/ssl/openssl/include/internal/ssl_lib.h similarity index 100% rename from components/openssl/include/internal/ssl_lib.h rename to components/ssl/openssl/include/internal/ssl_lib.h diff --git a/components/openssl/include/internal/ssl_methods.h b/components/ssl/openssl/include/internal/ssl_methods.h similarity index 100% rename from components/openssl/include/internal/ssl_methods.h rename to components/ssl/openssl/include/internal/ssl_methods.h diff --git a/components/openssl/include/internal/ssl_pkey.h b/components/ssl/openssl/include/internal/ssl_pkey.h similarity index 100% rename from components/openssl/include/internal/ssl_pkey.h rename to components/ssl/openssl/include/internal/ssl_pkey.h diff --git a/components/openssl/include/internal/ssl_stack.h b/components/ssl/openssl/include/internal/ssl_stack.h similarity index 100% rename from components/openssl/include/internal/ssl_stack.h rename to components/ssl/openssl/include/internal/ssl_stack.h diff --git a/components/openssl/include/internal/ssl_types.h b/components/ssl/openssl/include/internal/ssl_types.h similarity index 100% rename from components/openssl/include/internal/ssl_types.h rename to components/ssl/openssl/include/internal/ssl_types.h diff --git a/components/openssl/include/internal/ssl_x509.h b/components/ssl/openssl/include/internal/ssl_x509.h similarity index 100% rename from components/openssl/include/internal/ssl_x509.h rename to components/ssl/openssl/include/internal/ssl_x509.h diff --git a/components/openssl/include/internal/tls1.h b/components/ssl/openssl/include/internal/tls1.h similarity index 100% rename from components/openssl/include/internal/tls1.h rename to components/ssl/openssl/include/internal/tls1.h diff --git a/components/openssl/include/internal/x509_vfy.h b/components/ssl/openssl/include/internal/x509_vfy.h similarity index 100% rename from components/openssl/include/internal/x509_vfy.h rename to components/ssl/openssl/include/internal/x509_vfy.h diff --git a/components/openssl/include/openssl/ssl.h b/components/ssl/openssl/include/openssl/ssl.h similarity index 100% rename from components/openssl/include/openssl/ssl.h rename to components/ssl/openssl/include/openssl/ssl.h diff --git a/components/openssl/include/platform/ssl_opt.h b/components/ssl/openssl/include/platform/ssl_opt.h similarity index 100% rename from components/openssl/include/platform/ssl_opt.h rename to components/ssl/openssl/include/platform/ssl_opt.h diff --git a/components/openssl/include/platform/ssl_pm.h b/components/ssl/openssl/include/platform/ssl_pm.h similarity index 100% rename from components/openssl/include/platform/ssl_pm.h rename to components/ssl/openssl/include/platform/ssl_pm.h diff --git a/components/openssl/include/platform/ssl_port.h b/components/ssl/openssl/include/platform/ssl_port.h similarity index 81% rename from components/openssl/include/platform/ssl_port.h rename to components/ssl/openssl/include/platform/ssl_port.h index 133fc968..4403c420 100644 --- a/components/openssl/include/platform/ssl_port.h +++ b/components/ssl/openssl/include/platform/ssl_port.h @@ -31,20 +31,17 @@ extern void vPortFree(void *pv, const char * file, unsigned line); #define ssl_mem_malloc(s) \ ({ \ - static const char mem_debug_file[] ICACHE_RODATA_ATTR STORE_ATTR = __FILE__; \ - pvPortMalloc(s, mem_debug_file, __LINE__, false); \ + pvPortMalloc(s, __FILE__, __LINE__, false); \ }) #define ssl_mem_zalloc(s) \ ({ \ - static const char mem_debug_file[] ICACHE_RODATA_ATTR STORE_ATTR = __FILE__; \ - pvPortZalloc(s, mem_debug_file, __LINE__); \ + pvPortZalloc(s, __FILE__, __LINE__); \ }) #define ssl_mem_free(s) \ do{\ - static const char mem_debug_file[] ICACHE_RODATA_ATTR STORE_ATTR = __FILE__; \ - vPortFree(s, mem_debug_file, __LINE__);\ + vPortFree(s, __FILE__, __LINE__);\ }while(0) diff --git a/components/openssl/source/library/ssl_cert.c b/components/ssl/openssl/source/library/ssl_cert.c similarity index 100% rename from components/openssl/source/library/ssl_cert.c rename to components/ssl/openssl/source/library/ssl_cert.c diff --git a/components/openssl/source/library/ssl_lib.c b/components/ssl/openssl/source/library/ssl_lib.c similarity index 100% rename from components/openssl/source/library/ssl_lib.c rename to components/ssl/openssl/source/library/ssl_lib.c diff --git a/components/openssl/source/library/ssl_methods.c b/components/ssl/openssl/source/library/ssl_methods.c similarity index 100% rename from components/openssl/source/library/ssl_methods.c rename to components/ssl/openssl/source/library/ssl_methods.c diff --git a/components/openssl/source/library/ssl_pkey.c b/components/ssl/openssl/source/library/ssl_pkey.c similarity index 100% rename from components/openssl/source/library/ssl_pkey.c rename to components/ssl/openssl/source/library/ssl_pkey.c diff --git a/components/openssl/source/library/ssl_stack.c b/components/ssl/openssl/source/library/ssl_stack.c similarity index 100% rename from components/openssl/source/library/ssl_stack.c rename to components/ssl/openssl/source/library/ssl_stack.c diff --git a/components/openssl/source/library/ssl_x509.c b/components/ssl/openssl/source/library/ssl_x509.c similarity index 100% rename from components/openssl/source/library/ssl_x509.c rename to components/ssl/openssl/source/library/ssl_x509.c diff --git a/components/openssl/source/platform/ssl_pm.c b/components/ssl/openssl/source/platform/ssl_pm.c similarity index 100% rename from components/openssl/source/platform/ssl_pm.c rename to components/ssl/openssl/source/platform/ssl_pm.c diff --git a/components/openssl/source/platform/ssl_pm_extend.c b/components/ssl/openssl/source/platform/ssl_pm_extend.c similarity index 100% rename from components/openssl/source/platform/ssl_pm_extend.c rename to components/ssl/openssl/source/platform/ssl_pm_extend.c