Lay groundwork for support for mbedtls 2 and 3

#944
bibledit · Jul 20, 2024 · 0d191e9 · 0d191e9
1 parent 2715378
commit 0d191e9
Show file tree

Hide file tree

Showing 407 changed files with 210 additions and 6,797 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,4 @@ server
 *.tar.gz
 configure~
 libbibledit.a.*
-
+pkgdata/.*
diff --git a/0readme.txt b/0readme.txt
@@ -0,0 +1,196 @@
+Building Bibledit
+=================
+
+MbedTLS
+=======
+
+The source tree contains two versions of MbedTLS.
+* MbedTLS 2.x in folder mbedtls2.
+* MbedTLS 3.x in folder mbedtls3.
+
+Switching between the two versions can be done as follows.
+1. Define MBEDTLS2 or MBEDTLS3.
+2. Put the relevant source code in Makefile.am.
+   The source code is listed below for both versions.
+
+Version 2 source code:
+
+  mbedtls/aes.c \
+  mbedtls/arc4.c \
+  mbedtls/asn1parse.c \
+  mbedtls/asn1write.c \
+  mbedtls/base64.c \
+  mbedtls/bignum.c \
+  mbedtls/blowfish.c \
+  mbedtls/camellia.c \
+  mbedtls/ccm.c \
+  mbedtls/certs.c \
+  mbedtls/chacha20.c \
+  mbedtls/chachapoly.c \
+  mbedtls/cipher.c \
+  mbedtls/cipher_wrap.c \
+  mbedtls/ctr_drbg.c \
+  mbedtls/debug.c \
+  mbedtls/des.c \
+  mbedtls/dhm.c \
+  mbedtls/ecdh.c \
+  mbedtls/ecdsa.c \
+  mbedtls/ecp.c \
+  mbedtls/ecp_curves.c \
+  mbedtls/entropy.c \
+  mbedtls/entropy_poll.c \
+  mbedtls/error.c \
+  mbedtls/gcm.c \
+  mbedtls/hmac_drbg.c \
+  mbedtls/md.c \
+  mbedtls/md5.c \
+  mbedtls/md_wrap.c \
+  mbedtls/net_sockets.c \
+  mbedtls/oid.c \
+  mbedtls/pem.c \
+  mbedtls/pk.c \
+  mbedtls/pk_wrap.c \
+  mbedtls/pkcs12.c \
+  mbedtls/pkcs5.c \
+  mbedtls/pkparse.c \
+  mbedtls/pkwrite.c \
+  mbedtls/platform_util.c \
+  mbedtls/platform.c \
+  mbedtls/poly1305.c \
+  mbedtls/ripemd160.c \
+  mbedtls/rsa.c \
+  mbedtls/rsa_internal.c \
+  mbedtls/sha1.c \
+  mbedtls/sha256.c \
+  mbedtls/sha512.c \
+  mbedtls/ssl_cache.c \
+  mbedtls/ssl_ciphersuites.c \
+  mbedtls/ssl_cli.c \
+  mbedtls/ssl_cookie.c \
+  mbedtls/ssl_srv.c \
+  mbedtls/ssl_ticket.c \
+  mbedtls/ssl_tls.c \
+  mbedtls/threading.c \
+  mbedtls/timing.c \
+  mbedtls/version.c \
+  mbedtls/version_features.c \
+  mbedtls/x509.c \
+  mbedtls/x509_create.c \
+  mbedtls/x509_crl.c \
+  mbedtls/x509_crt.c \
+  mbedtls/x509_csr.c \
+  mbedtls/x509write_crt.c \
+  mbedtls/x509write_csr.c \
+  mbedtls/xtea.c \
+
+Version 3 source code:
+
+  mbedtls/aes.c \
+  mbedtls/aesce.c \
+  mbedtls/aesni.c \
+  mbedtls/aria.c \
+  mbedtls/asn1parse.c \
+  mbedtls/asn1write.c \
+  mbedtls/base64.c \
+  mbedtls/bignum.c \
+  mbedtls/bignum_core.c \
+  mbedtls/bignum_mod.c \
+  mbedtls/bignum_mod_raw.c \
+  mbedtls/block_cipher.c \
+  mbedtls/camellia.c \
+  mbedtls/ccm.c \
+  mbedtls/chacha20.c \
+  mbedtls/chachapoly.c \
+  mbedtls/cipher.c \
+  mbedtls/cipher_wrap.c \
+  mbedtls/cmac.c \
+  mbedtls/constant_time.c \
+  mbedtls/ctr_drbg.c \
+  mbedtls/debug.c \
+  mbedtls/des.c \
+  mbedtls/dhm.c \
+  mbedtls/ecdh.c \
+  mbedtls/ecdsa.c \
+  mbedtls/ecjpake.c \
+  mbedtls/ecp.c \
+  mbedtls/ecp_curves.c \
+  mbedtls/ecp_curves_new.c \
+  mbedtls/entropy.c \
+  mbedtls/entropy_poll.c \
+  mbedtls/error.c \
+  mbedtls/gcm.c \
+  mbedtls/hkdf.c \
+  mbedtls/hmac_drbg.c \
+  mbedtls/lmots.c \
+  mbedtls/lms.c \
+  mbedtls/md.c \
+  mbedtls/md5.c \
+  mbedtls/memory_buffer_alloc.c \
+  mbedtls/mps_reader.c \
+  mbedtls/mps_trace.c \
+  mbedtls/net_sockets.c \
+  mbedtls/nist_kw.c \
+  mbedtls/oid.c \
+  mbedtls/padlock.c \
+  mbedtls/pem.c \
+  mbedtls/pk.c \
+  mbedtls/pk_ecc.c \
+  mbedtls/pk_wrap.c \
+  mbedtls/pkcs12.c \
+  mbedtls/pkcs5.c \
+  mbedtls/pkcs7.c \
+  mbedtls/pkparse.c \
+  mbedtls/pkwrite.c \
+  mbedtls/platform.c \
+  mbedtls/platform_util.c \
+  mbedtls/poly1305.c \
+  mbedtls/psa_crypto.c \
+  mbedtls/psa_crypto_aead.c \
+  mbedtls/psa_crypto_cipher.c \
+  mbedtls/psa_crypto_client.c \
+  mbedtls/psa_crypto_driver_wrappers_no_static.c \
+  mbedtls/psa_crypto_ecp.c \
+  mbedtls/psa_crypto_ffdh.c \
+  mbedtls/psa_crypto_hash.c \
+  mbedtls/psa_crypto_mac.c \
+  mbedtls/psa_crypto_pake.c \
+  mbedtls/psa_crypto_rsa.c \
+  mbedtls/psa_crypto_se.c \
+  mbedtls/psa_crypto_slot_management.c \
+  mbedtls/psa_crypto_storage.c \
+  mbedtls/psa_its_file.c \
+  mbedtls/psa_util.c \
+  mbedtls/ripemd160.c \
+  mbedtls/rsa.c \
+  mbedtls/rsa_alt_helpers.c \
+  mbedtls/sha1.c \
+  mbedtls/sha256.c \
+  mbedtls/sha3.c \
+  mbedtls/sha512.c \
+  mbedtls/ssl_cache.c \
+  mbedtls/ssl_ciphersuites.c \
+  mbedtls/ssl_client.c \
+  mbedtls/ssl_cookie.c \
+  mbedtls/ssl_debug_helpers_generated.c \
+  mbedtls/ssl_msg.c \
+  mbedtls/ssl_ticket.c \
+  mbedtls/ssl_tls.c \
+  mbedtls/ssl_tls12_client.c \
+  mbedtls/ssl_tls12_server.c \
+  mbedtls/ssl_tls13_client.c \
+  mbedtls/ssl_tls13_generic.c \
+  mbedtls/ssl_tls13_keys.c \
+  mbedtls/ssl_tls13_server.c \
+  mbedtls/threading.c \
+  mbedtls/timing.c \
+  mbedtls/version.c \
+  mbedtls/version_features.c \
+  mbedtls/x509.c \
+  mbedtls/x509_create.c \
+  mbedtls/x509_crl.c \
+  mbedtls/x509_crt.c \
+  mbedtls/x509_csr.c \
+  mbedtls/x509write.c \
+  mbedtls/x509write_crt.c \
+  mbedtls/x509write_csr.c \
+
diff --git a/config/config.h b/config/config.h
@@ -40,6 +40,11 @@
 #define RUN_SECURE_SERVER 1
 
 
+// Which version of MbedTLS to use.
+//#define HAVE_MBEDTLS2 1
+#define HAVE_MBEDTLS3 1
+
+
 #ifdef HAVE_WINDOWS
 #undef HAVE_CLOUD
 #define HAVE_CLIENT 1
@@ -95,5 +100,3 @@
 #define HAVE_TINY_JOURNAL 1
 #undef RUN_SECURE_SERVER
 #endif
-
-
diff --git a/mbedtls b/mbedtls
@@ -0,0 +1 @@
+mbedtls3
diff --git a/mbedtls2windows/0readme.txt → mbedtls2/0readme.txt b/mbedtls2windows/0readme.txt → mbedtls2/0readme.txt
diff --git a/mbedtls2windows/aes.c → mbedtls2/aes.c b/mbedtls2windows/aes.c → mbedtls2/aes.c
diff --git a/mbedtls2windows/aes.h → mbedtls2/aes.h b/mbedtls2windows/aes.h → mbedtls2/aes.h
diff --git a/mbedtls2windows/aesni.c → mbedtls2/aesni.c b/mbedtls2windows/aesni.c → mbedtls2/aesni.c
diff --git a/mbedtls2windows/aesni.h → mbedtls2/aesni.h b/mbedtls2windows/aesni.h → mbedtls2/aesni.h
diff --git a/mbedtls2windows/arc4.c → mbedtls2/arc4.c b/mbedtls2windows/arc4.c → mbedtls2/arc4.c
diff --git a/mbedtls2windows/arc4.h → mbedtls2/arc4.h b/mbedtls2windows/arc4.h → mbedtls2/arc4.h
diff --git a/mbedtls2windows/aria.c → mbedtls2/aria.c b/mbedtls2windows/aria.c → mbedtls2/aria.c
diff --git a/mbedtls2windows/aria.h → mbedtls2/aria.h b/mbedtls2windows/aria.h → mbedtls2/aria.h
diff --git a/mbedtls2windows/asn1.h → mbedtls2/asn1.h b/mbedtls2windows/asn1.h → mbedtls2/asn1.h
diff --git a/mbedtls2windows/asn1parse.c → mbedtls2/asn1parse.c b/mbedtls2windows/asn1parse.c → mbedtls2/asn1parse.c
diff --git a/mbedtls2windows/asn1write.c → mbedtls2/asn1write.c b/mbedtls2windows/asn1write.c → mbedtls2/asn1write.c
diff --git a/mbedtls2windows/asn1write.h → mbedtls2/asn1write.h b/mbedtls2windows/asn1write.h → mbedtls2/asn1write.h
diff --git a/mbedtls2windows/base64.c → mbedtls2/base64.c b/mbedtls2windows/base64.c → mbedtls2/base64.c
diff --git a/mbedtls2windows/base64.h → mbedtls2/base64.h b/mbedtls2windows/base64.h → mbedtls2/base64.h
diff --git a/mbedtls2windows/bignum.c → mbedtls2/bignum.c b/mbedtls2windows/bignum.c → mbedtls2/bignum.c
diff --git a/mbedtls2windows/bignum.h → mbedtls2/bignum.h b/mbedtls2windows/bignum.h → mbedtls2/bignum.h
diff --git a/mbedtls2windows/blowfish.c → mbedtls2/blowfish.c b/mbedtls2windows/blowfish.c → mbedtls2/blowfish.c
diff --git a/mbedtls2windows/blowfish.h → mbedtls2/blowfish.h b/mbedtls2windows/blowfish.h → mbedtls2/blowfish.h
diff --git a/mbedtls2windows/bn_mul.h → mbedtls2/bn_mul.h b/mbedtls2windows/bn_mul.h → mbedtls2/bn_mul.h
diff --git a/mbedtls2windows/camellia.c → mbedtls2/camellia.c b/mbedtls2windows/camellia.c → mbedtls2/camellia.c
diff --git a/mbedtls2windows/camellia.h → mbedtls2/camellia.h b/mbedtls2windows/camellia.h → mbedtls2/camellia.h
diff --git a/mbedtls2windows/ccm.c → mbedtls2/ccm.c b/mbedtls2windows/ccm.c → mbedtls2/ccm.c
diff --git a/mbedtls2windows/ccm.h → mbedtls2/ccm.h b/mbedtls2windows/ccm.h → mbedtls2/ccm.h
diff --git a/mbedtls2windows/certs.c → mbedtls2/certs.c b/mbedtls2windows/certs.c → mbedtls2/certs.c
diff --git a/mbedtls2windows/certs.h → mbedtls2/certs.h b/mbedtls2windows/certs.h → mbedtls2/certs.h
diff --git a/mbedtls2windows/chacha20.c → mbedtls2/chacha20.c b/mbedtls2windows/chacha20.c → mbedtls2/chacha20.c
diff --git a/mbedtls2windows/chacha20.h → mbedtls2/chacha20.h b/mbedtls2windows/chacha20.h → mbedtls2/chacha20.h
diff --git a/mbedtls2windows/chachapoly.c → mbedtls2/chachapoly.c b/mbedtls2windows/chachapoly.c → mbedtls2/chachapoly.c
diff --git a/mbedtls2windows/chachapoly.h → mbedtls2/chachapoly.h b/mbedtls2windows/chachapoly.h → mbedtls2/chachapoly.h
diff --git a/mbedtls2windows/check_config.h → mbedtls2/check_config.h b/mbedtls2windows/check_config.h → mbedtls2/check_config.h
diff --git a/mbedtls2windows/cipher.c → mbedtls2/cipher.c b/mbedtls2windows/cipher.c → mbedtls2/cipher.c
diff --git a/mbedtls2windows/cipher.h → mbedtls2/cipher.h b/mbedtls2windows/cipher.h → mbedtls2/cipher.h
diff --git a/mbedtls2windows/cipher_internal.h → mbedtls2/cipher_internal.h b/mbedtls2windows/cipher_internal.h → mbedtls2/cipher_internal.h
diff --git a/mbedtls2windows/cipher_wrap.c → mbedtls2/cipher_wrap.c b/mbedtls2windows/cipher_wrap.c → mbedtls2/cipher_wrap.c
diff --git a/mbedtls2windows/cmac.c → mbedtls2/cmac.c b/mbedtls2windows/cmac.c → mbedtls2/cmac.c
diff --git a/mbedtls2windows/cmac.h → mbedtls2/cmac.h b/mbedtls2windows/cmac.h → mbedtls2/cmac.h
diff --git a/mbedtls2windows/compat-1.3.h → mbedtls2/compat-1.3.h b/mbedtls2windows/compat-1.3.h → mbedtls2/compat-1.3.h
diff --git a/mbedtls2windows/config.h → mbedtls2/config.h b/mbedtls2windows/config.h → mbedtls2/config.h
diff --git a/mbedtls2windows/ctr_drbg.c → mbedtls2/ctr_drbg.c b/mbedtls2windows/ctr_drbg.c → mbedtls2/ctr_drbg.c
diff --git a/mbedtls2windows/ctr_drbg.h → mbedtls2/ctr_drbg.h b/mbedtls2windows/ctr_drbg.h → mbedtls2/ctr_drbg.h
diff --git a/mbedtls2windows/debug.c → mbedtls2/debug.c b/mbedtls2windows/debug.c → mbedtls2/debug.c
diff --git a/mbedtls2windows/debug.h → mbedtls2/debug.h b/mbedtls2windows/debug.h → mbedtls2/debug.h
diff --git a/mbedtls2windows/des.c → mbedtls2/des.c b/mbedtls2windows/des.c → mbedtls2/des.c
diff --git a/mbedtls2windows/des.h → mbedtls2/des.h b/mbedtls2windows/des.h → mbedtls2/des.h
diff --git a/mbedtls2windows/dhm.c → mbedtls2/dhm.c b/mbedtls2windows/dhm.c → mbedtls2/dhm.c
diff --git a/mbedtls2windows/dhm.h → mbedtls2/dhm.h b/mbedtls2windows/dhm.h → mbedtls2/dhm.h
diff --git a/mbedtls2windows/ecdh.c → mbedtls2/ecdh.c b/mbedtls2windows/ecdh.c → mbedtls2/ecdh.c
diff --git a/mbedtls2windows/ecdh.h → mbedtls2/ecdh.h b/mbedtls2windows/ecdh.h → mbedtls2/ecdh.h
diff --git a/mbedtls2windows/ecdsa.c → mbedtls2/ecdsa.c b/mbedtls2windows/ecdsa.c → mbedtls2/ecdsa.c
diff --git a/mbedtls2windows/ecdsa.h → mbedtls2/ecdsa.h b/mbedtls2windows/ecdsa.h → mbedtls2/ecdsa.h
diff --git a/mbedtls2windows/ecjpake.c → mbedtls2/ecjpake.c b/mbedtls2windows/ecjpake.c → mbedtls2/ecjpake.c
diff --git a/mbedtls2windows/ecjpake.h → mbedtls2/ecjpake.h b/mbedtls2windows/ecjpake.h → mbedtls2/ecjpake.h
diff --git a/mbedtls2windows/ecp.c → mbedtls2/ecp.c b/mbedtls2windows/ecp.c → mbedtls2/ecp.c
diff --git a/mbedtls2windows/ecp.h → mbedtls2/ecp.h b/mbedtls2windows/ecp.h → mbedtls2/ecp.h
diff --git a/mbedtls2windows/ecp_curves.c → mbedtls2/ecp_curves.c b/mbedtls2windows/ecp_curves.c → mbedtls2/ecp_curves.c
diff --git a/mbedtls2windows/ecp_internal.h → mbedtls2/ecp_internal.h b/mbedtls2windows/ecp_internal.h → mbedtls2/ecp_internal.h
diff --git a/mbedtls2windows/entropy.c → mbedtls2/entropy.c b/mbedtls2windows/entropy.c → mbedtls2/entropy.c
diff --git a/mbedtls2windows/entropy.h → mbedtls2/entropy.h b/mbedtls2windows/entropy.h → mbedtls2/entropy.h
diff --git a/mbedtls2windows/entropy_poll.c → mbedtls2/entropy_poll.c b/mbedtls2windows/entropy_poll.c → mbedtls2/entropy_poll.c
diff --git a/mbedtls2windows/entropy_poll.h → mbedtls2/entropy_poll.h b/mbedtls2windows/entropy_poll.h → mbedtls2/entropy_poll.h
diff --git a/mbedtls2windows/error.c → mbedtls2/error.c b/mbedtls2windows/error.c → mbedtls2/error.c
diff --git a/mbedtls2windows/error.h → mbedtls2/error.h b/mbedtls2windows/error.h → mbedtls2/error.h
diff --git a/mbedtls2windows/gcm.c → mbedtls2/gcm.c b/mbedtls2windows/gcm.c → mbedtls2/gcm.c
diff --git a/mbedtls2windows/gcm.h → mbedtls2/gcm.h b/mbedtls2windows/gcm.h → mbedtls2/gcm.h
diff --git a/mbedtls2windows/havege.c → mbedtls2/havege.c b/mbedtls2windows/havege.c → mbedtls2/havege.c
diff --git a/mbedtls2windows/havege.h → mbedtls2/havege.h b/mbedtls2windows/havege.h → mbedtls2/havege.h
diff --git a/mbedtls2windows/hkdf.c → mbedtls2/hkdf.c b/mbedtls2windows/hkdf.c → mbedtls2/hkdf.c
diff --git a/mbedtls2windows/hkdf.h → mbedtls2/hkdf.h b/mbedtls2windows/hkdf.h → mbedtls2/hkdf.h
diff --git a/mbedtls2windows/hmac_drbg.c → mbedtls2/hmac_drbg.c b/mbedtls2windows/hmac_drbg.c → mbedtls2/hmac_drbg.c
diff --git a/mbedtls2windows/hmac_drbg.h → mbedtls2/hmac_drbg.h b/mbedtls2windows/hmac_drbg.h → mbedtls2/hmac_drbg.h
diff --git a/mbedtls2windows/md.c → mbedtls2/md.c b/mbedtls2windows/md.c → mbedtls2/md.c
diff --git a/mbedtls2windows/md.h → mbedtls2/md.h b/mbedtls2windows/md.h → mbedtls2/md.h
diff --git a/mbedtls2windows/md2.c → mbedtls2/md2.c b/mbedtls2windows/md2.c → mbedtls2/md2.c
diff --git a/mbedtls2windows/md2.h → mbedtls2/md2.h b/mbedtls2windows/md2.h → mbedtls2/md2.h
diff --git a/mbedtls2windows/md4.c → mbedtls2/md4.c b/mbedtls2windows/md4.c → mbedtls2/md4.c
diff --git a/mbedtls2windows/md4.h → mbedtls2/md4.h b/mbedtls2windows/md4.h → mbedtls2/md4.h
diff --git a/mbedtls2windows/md5.c → mbedtls2/md5.c b/mbedtls2windows/md5.c → mbedtls2/md5.c
diff --git a/mbedtls2windows/md5.h → mbedtls2/md5.h b/mbedtls2windows/md5.h → mbedtls2/md5.h
diff --git a/mbedtls2windows/md_internal.h → mbedtls2/md_internal.h b/mbedtls2windows/md_internal.h → mbedtls2/md_internal.h
diff --git a/mbedtls2windows/md_wrap.c → mbedtls2/md_wrap.c b/mbedtls2windows/md_wrap.c → mbedtls2/md_wrap.c
diff --git a/mbedtls2windows/memory_buffer_alloc.c → mbedtls2/memory_buffer_alloc.c b/mbedtls2windows/memory_buffer_alloc.c → mbedtls2/memory_buffer_alloc.c
diff --git a/mbedtls2windows/memory_buffer_alloc.h → mbedtls2/memory_buffer_alloc.h b/mbedtls2windows/memory_buffer_alloc.h → mbedtls2/memory_buffer_alloc.h
diff --git a/mbedtls2windows/net.h → mbedtls2/net.h b/mbedtls2windows/net.h → mbedtls2/net.h
diff --git a/mbedtls2windows/net_sockets.c → mbedtls2/net_sockets.c b/mbedtls2windows/net_sockets.c → mbedtls2/net_sockets.c
diff --git a/mbedtls2windows/net_sockets.h → mbedtls2/net_sockets.h b/mbedtls2windows/net_sockets.h → mbedtls2/net_sockets.h
diff --git a/mbedtls2windows/nist_kw.c → mbedtls2/nist_kw.c b/mbedtls2windows/nist_kw.c → mbedtls2/nist_kw.c
diff --git a/mbedtls2windows/nist_kw.h → mbedtls2/nist_kw.h b/mbedtls2windows/nist_kw.h → mbedtls2/nist_kw.h
diff --git a/mbedtls2windows/oid.c → mbedtls2/oid.c b/mbedtls2windows/oid.c → mbedtls2/oid.c
diff --git a/mbedtls2windows/oid.h → mbedtls2/oid.h b/mbedtls2windows/oid.h → mbedtls2/oid.h
diff --git a/mbedtls2windows/padlock.c → mbedtls2/padlock.c b/mbedtls2windows/padlock.c → mbedtls2/padlock.c
diff --git a/mbedtls2windows/padlock.h → mbedtls2/padlock.h b/mbedtls2windows/padlock.h → mbedtls2/padlock.h
diff --git a/mbedtls2windows/pem.c → mbedtls2/pem.c b/mbedtls2windows/pem.c → mbedtls2/pem.c
diff --git a/mbedtls2windows/pem.h → mbedtls2/pem.h b/mbedtls2windows/pem.h → mbedtls2/pem.h
diff --git a/mbedtls2windows/pk.c → mbedtls2/pk.c b/mbedtls2windows/pk.c → mbedtls2/pk.c
diff --git a/mbedtls2windows/pk.h → mbedtls2/pk.h b/mbedtls2windows/pk.h → mbedtls2/pk.h
diff --git a/mbedtls2windows/pk_internal.h → mbedtls2/pk_internal.h b/mbedtls2windows/pk_internal.h → mbedtls2/pk_internal.h
diff --git a/mbedtls2windows/pk_wrap.c → mbedtls2/pk_wrap.c b/mbedtls2windows/pk_wrap.c → mbedtls2/pk_wrap.c
diff --git a/mbedtls2windows/pkcs11.c → mbedtls2/pkcs11.c b/mbedtls2windows/pkcs11.c → mbedtls2/pkcs11.c
diff --git a/mbedtls2windows/pkcs11.h → mbedtls2/pkcs11.h b/mbedtls2windows/pkcs11.h → mbedtls2/pkcs11.h
diff --git a/mbedtls2windows/pkcs12.c → mbedtls2/pkcs12.c b/mbedtls2windows/pkcs12.c → mbedtls2/pkcs12.c
diff --git a/mbedtls2windows/pkcs12.h → mbedtls2/pkcs12.h b/mbedtls2windows/pkcs12.h → mbedtls2/pkcs12.h
diff --git a/mbedtls2windows/pkcs5.c → mbedtls2/pkcs5.c b/mbedtls2windows/pkcs5.c → mbedtls2/pkcs5.c
diff --git a/mbedtls2windows/pkcs5.h → mbedtls2/pkcs5.h b/mbedtls2windows/pkcs5.h → mbedtls2/pkcs5.h
diff --git a/mbedtls2windows/pkparse.c → mbedtls2/pkparse.c b/mbedtls2windows/pkparse.c → mbedtls2/pkparse.c
diff --git a/mbedtls2windows/pkwrite.c → mbedtls2/pkwrite.c b/mbedtls2windows/pkwrite.c → mbedtls2/pkwrite.c
diff --git a/mbedtls2windows/platform.c → mbedtls2/platform.c b/mbedtls2windows/platform.c → mbedtls2/platform.c
diff --git a/mbedtls2windows/platform.h → mbedtls2/platform.h b/mbedtls2windows/platform.h → mbedtls2/platform.h
diff --git a/mbedtls2windows/platform_time.h → mbedtls2/platform_time.h b/mbedtls2windows/platform_time.h → mbedtls2/platform_time.h
diff --git a/mbedtls2windows/platform_util.c → mbedtls2/platform_util.c b/mbedtls2windows/platform_util.c → mbedtls2/platform_util.c
diff --git a/mbedtls2windows/platform_util.h → mbedtls2/platform_util.h b/mbedtls2windows/platform_util.h → mbedtls2/platform_util.h
diff --git a/mbedtls2windows/poly1305.c → mbedtls2/poly1305.c b/mbedtls2windows/poly1305.c → mbedtls2/poly1305.c
diff --git a/mbedtls2windows/poly1305.h → mbedtls2/poly1305.h b/mbedtls2windows/poly1305.h → mbedtls2/poly1305.h
diff --git a/mbedtls2windows/ripemd160.c → mbedtls2/ripemd160.c b/mbedtls2windows/ripemd160.c → mbedtls2/ripemd160.c
diff --git a/mbedtls2windows/ripemd160.h → mbedtls2/ripemd160.h b/mbedtls2windows/ripemd160.h → mbedtls2/ripemd160.h
diff --git a/mbedtls2windows/rsa.c → mbedtls2/rsa.c b/mbedtls2windows/rsa.c → mbedtls2/rsa.c
diff --git a/mbedtls2windows/rsa.h → mbedtls2/rsa.h b/mbedtls2windows/rsa.h → mbedtls2/rsa.h
diff --git a/mbedtls2windows/rsa_internal.c → mbedtls2/rsa_internal.c b/mbedtls2windows/rsa_internal.c → mbedtls2/rsa_internal.c
diff --git a/mbedtls2windows/rsa_internal.h → mbedtls2/rsa_internal.h b/mbedtls2windows/rsa_internal.h → mbedtls2/rsa_internal.h
diff --git a/mbedtls2windows/sha1.c → mbedtls2/sha1.c b/mbedtls2windows/sha1.c → mbedtls2/sha1.c
diff --git a/mbedtls2windows/sha1.h → mbedtls2/sha1.h b/mbedtls2windows/sha1.h → mbedtls2/sha1.h
diff --git a/mbedtls2windows/sha256.c → mbedtls2/sha256.c b/mbedtls2windows/sha256.c → mbedtls2/sha256.c
diff --git a/mbedtls2windows/sha256.h → mbedtls2/sha256.h b/mbedtls2windows/sha256.h → mbedtls2/sha256.h
diff --git a/mbedtls2windows/sha512.c → mbedtls2/sha512.c b/mbedtls2windows/sha512.c → mbedtls2/sha512.c
diff --git a/mbedtls2windows/sha512.h → mbedtls2/sha512.h b/mbedtls2windows/sha512.h → mbedtls2/sha512.h
diff --git a/mbedtls2windows/ssl.h → mbedtls2/ssl.h b/mbedtls2windows/ssl.h → mbedtls2/ssl.h
diff --git a/mbedtls2windows/ssl_cache.c → mbedtls2/ssl_cache.c b/mbedtls2windows/ssl_cache.c → mbedtls2/ssl_cache.c
diff --git a/mbedtls2windows/ssl_cache.h → mbedtls2/ssl_cache.h b/mbedtls2windows/ssl_cache.h → mbedtls2/ssl_cache.h
diff --git a/mbedtls2windows/ssl_ciphersuites.c → mbedtls2/ssl_ciphersuites.c b/mbedtls2windows/ssl_ciphersuites.c → mbedtls2/ssl_ciphersuites.c
diff --git a/mbedtls2windows/ssl_ciphersuites.h → mbedtls2/ssl_ciphersuites.h b/mbedtls2windows/ssl_ciphersuites.h → mbedtls2/ssl_ciphersuites.h
diff --git a/mbedtls2windows/ssl_cli.c → mbedtls2/ssl_cli.c b/mbedtls2windows/ssl_cli.c → mbedtls2/ssl_cli.c
diff --git a/mbedtls2windows/ssl_cookie.c → mbedtls2/ssl_cookie.c b/mbedtls2windows/ssl_cookie.c → mbedtls2/ssl_cookie.c
diff --git a/mbedtls2windows/ssl_cookie.h → mbedtls2/ssl_cookie.h b/mbedtls2windows/ssl_cookie.h → mbedtls2/ssl_cookie.h
diff --git a/mbedtls2windows/ssl_internal.h → mbedtls2/ssl_internal.h b/mbedtls2windows/ssl_internal.h → mbedtls2/ssl_internal.h
diff --git a/mbedtls2windows/ssl_srv.c → mbedtls2/ssl_srv.c b/mbedtls2windows/ssl_srv.c → mbedtls2/ssl_srv.c
diff --git a/mbedtls2windows/ssl_ticket.c → mbedtls2/ssl_ticket.c b/mbedtls2windows/ssl_ticket.c → mbedtls2/ssl_ticket.c
diff --git a/mbedtls2windows/ssl_ticket.h → mbedtls2/ssl_ticket.h b/mbedtls2windows/ssl_ticket.h → mbedtls2/ssl_ticket.h
diff --git a/mbedtls2windows/ssl_tls.c → mbedtls2/ssl_tls.c b/mbedtls2windows/ssl_tls.c → mbedtls2/ssl_tls.c
diff --git a/mbedtls2windows/threading.c → mbedtls2/threading.c b/mbedtls2windows/threading.c → mbedtls2/threading.c
diff --git a/mbedtls2windows/threading.h → mbedtls2/threading.h b/mbedtls2windows/threading.h → mbedtls2/threading.h
diff --git a/mbedtls2windows/timing.c → mbedtls2/timing.c b/mbedtls2windows/timing.c → mbedtls2/timing.c
diff --git a/mbedtls2windows/timing.h → mbedtls2/timing.h b/mbedtls2windows/timing.h → mbedtls2/timing.h
diff --git a/mbedtls2windows/version.c → mbedtls2/version.c b/mbedtls2windows/version.c → mbedtls2/version.c
diff --git a/mbedtls2windows/version.h → mbedtls2/version.h b/mbedtls2windows/version.h → mbedtls2/version.h
diff --git a/mbedtls2windows/version_features.c → mbedtls2/version_features.c b/mbedtls2windows/version_features.c → mbedtls2/version_features.c
diff --git a/mbedtls2windows/x509.c → mbedtls2/x509.c b/mbedtls2windows/x509.c → mbedtls2/x509.c
diff --git a/mbedtls2windows/x509.h → mbedtls2/x509.h b/mbedtls2windows/x509.h → mbedtls2/x509.h
diff --git a/mbedtls2windows/x509_create.c → mbedtls2/x509_create.c b/mbedtls2windows/x509_create.c → mbedtls2/x509_create.c
diff --git a/mbedtls2windows/x509_crl.c → mbedtls2/x509_crl.c b/mbedtls2windows/x509_crl.c → mbedtls2/x509_crl.c
diff --git a/mbedtls2windows/x509_crl.h → mbedtls2/x509_crl.h b/mbedtls2windows/x509_crl.h → mbedtls2/x509_crl.h
diff --git a/mbedtls2windows/x509_crt.c → mbedtls2/x509_crt.c b/mbedtls2windows/x509_crt.c → mbedtls2/x509_crt.c
diff --git a/mbedtls2windows/x509_crt.h → mbedtls2/x509_crt.h b/mbedtls2windows/x509_crt.h → mbedtls2/x509_crt.h
diff --git a/mbedtls2windows/x509_csr.c → mbedtls2/x509_csr.c b/mbedtls2windows/x509_csr.c → mbedtls2/x509_csr.c
diff --git a/mbedtls2windows/x509_csr.h → mbedtls2/x509_csr.h b/mbedtls2windows/x509_csr.h → mbedtls2/x509_csr.h
diff --git a/mbedtls2windows/x509write_crt.c → mbedtls2/x509write_crt.c b/mbedtls2windows/x509write_crt.c → mbedtls2/x509write_crt.c
diff --git a/mbedtls2windows/x509write_csr.c → mbedtls2/x509write_csr.c b/mbedtls2windows/x509write_csr.c → mbedtls2/x509write_csr.c
diff --git a/mbedtls2windows/xtea.c → mbedtls2/xtea.c b/mbedtls2windows/xtea.c → mbedtls2/xtea.c
diff --git a/mbedtls2windows/xtea.h → mbedtls2/xtea.h b/mbedtls2windows/xtea.h → mbedtls2/xtea.h
diff --git a/mbedtls/0readme.txt → mbedtls3/0readme.txt b/mbedtls/0readme.txt → mbedtls3/0readme.txt
diff --git a/mbedtls/aes.c → mbedtls3/aes.c b/mbedtls/aes.c → mbedtls3/aes.c
diff --git a/mbedtls/aes.h → mbedtls3/aes.h b/mbedtls/aes.h → mbedtls3/aes.h
diff --git a/mbedtls/aesce.c → mbedtls3/aesce.c b/mbedtls/aesce.c → mbedtls3/aesce.c
diff --git a/mbedtls/aesce.h → mbedtls3/aesce.h b/mbedtls/aesce.h → mbedtls3/aesce.h
diff --git a/mbedtls/aesni.c → mbedtls3/aesni.c b/mbedtls/aesni.c → mbedtls3/aesni.c
diff --git a/mbedtls/aesni.h → mbedtls3/aesni.h b/mbedtls/aesni.h → mbedtls3/aesni.h
diff --git a/mbedtls/alignment.h → mbedtls3/alignment.h b/mbedtls/alignment.h → mbedtls3/alignment.h
diff --git a/mbedtls/aria.c → mbedtls3/aria.c b/mbedtls/aria.c → mbedtls3/aria.c
diff --git a/mbedtls/aria.h → mbedtls3/aria.h b/mbedtls/aria.h → mbedtls3/aria.h
diff --git a/mbedtls/asn1.h → mbedtls3/asn1.h b/mbedtls/asn1.h → mbedtls3/asn1.h
diff --git a/mbedtls/asn1parse.c → mbedtls3/asn1parse.c b/mbedtls/asn1parse.c → mbedtls3/asn1parse.c
diff --git a/mbedtls/asn1write.c → mbedtls3/asn1write.c b/mbedtls/asn1write.c → mbedtls3/asn1write.c
diff --git a/mbedtls/asn1write.h → mbedtls3/asn1write.h b/mbedtls/asn1write.h → mbedtls3/asn1write.h
diff --git a/mbedtls/base64.c → mbedtls3/base64.c b/mbedtls/base64.c → mbedtls3/base64.c
diff --git a/mbedtls/base64.h → mbedtls3/base64.h b/mbedtls/base64.h → mbedtls3/base64.h
diff --git a/mbedtls/base64_internal.h → mbedtls3/base64_internal.h b/mbedtls/base64_internal.h → mbedtls3/base64_internal.h
diff --git a/mbedtls/bignum.c → mbedtls3/bignum.c b/mbedtls/bignum.c → mbedtls3/bignum.c
diff --git a/mbedtls/bignum.h → mbedtls3/bignum.h b/mbedtls/bignum.h → mbedtls3/bignum.h
diff --git a/mbedtls/bignum_core.c → mbedtls3/bignum_core.c b/mbedtls/bignum_core.c → mbedtls3/bignum_core.c
diff --git a/mbedtls/bignum_core.h → mbedtls3/bignum_core.h b/mbedtls/bignum_core.h → mbedtls3/bignum_core.h
diff --git a/mbedtls/bignum_mod.c → mbedtls3/bignum_mod.c b/mbedtls/bignum_mod.c → mbedtls3/bignum_mod.c
diff --git a/mbedtls/bignum_mod.h → mbedtls3/bignum_mod.h b/mbedtls/bignum_mod.h → mbedtls3/bignum_mod.h
diff --git a/mbedtls/bignum_mod_raw.c → mbedtls3/bignum_mod_raw.c b/mbedtls/bignum_mod_raw.c → mbedtls3/bignum_mod_raw.c
diff --git a/mbedtls/bignum_mod_raw.h → mbedtls3/bignum_mod_raw.h b/mbedtls/bignum_mod_raw.h → mbedtls3/bignum_mod_raw.h
diff --git a/mbedtls/bignum_mod_raw_invasive.h → mbedtls3/bignum_mod_raw_invasive.h b/mbedtls/bignum_mod_raw_invasive.h → mbedtls3/bignum_mod_raw_invasive.h
diff --git a/mbedtls/block_cipher.c → mbedtls3/block_cipher.c b/mbedtls/block_cipher.c → mbedtls3/block_cipher.c
diff --git a/mbedtls/block_cipher.h → mbedtls3/block_cipher.h b/mbedtls/block_cipher.h → mbedtls3/block_cipher.h
diff --git a/mbedtls/block_cipher_internal.h → mbedtls3/block_cipher_internal.h b/mbedtls/block_cipher_internal.h → mbedtls3/block_cipher_internal.h
diff --git a/mbedtls/bn_mul.h → mbedtls3/bn_mul.h b/mbedtls/bn_mul.h → mbedtls3/bn_mul.h
diff --git a/mbedtls/build_info.h → mbedtls3/build_info.h b/mbedtls/build_info.h → mbedtls3/build_info.h
diff --git a/mbedtls/camellia.c → mbedtls3/camellia.c b/mbedtls/camellia.c → mbedtls3/camellia.c
diff --git a/mbedtls/camellia.h → mbedtls3/camellia.h b/mbedtls/camellia.h → mbedtls3/camellia.h
diff --git a/mbedtls/ccm.c → mbedtls3/ccm.c b/mbedtls/ccm.c → mbedtls3/ccm.c
diff --git a/mbedtls/ccm.h → mbedtls3/ccm.h b/mbedtls/ccm.h → mbedtls3/ccm.h
diff --git a/mbedtls/chacha20.c → mbedtls3/chacha20.c b/mbedtls/chacha20.c → mbedtls3/chacha20.c
diff --git a/mbedtls/chacha20.h → mbedtls3/chacha20.h b/mbedtls/chacha20.h → mbedtls3/chacha20.h
diff --git a/mbedtls/chachapoly.c → mbedtls3/chachapoly.c b/mbedtls/chachapoly.c → mbedtls3/chachapoly.c
diff --git a/mbedtls/chachapoly.h → mbedtls3/chachapoly.h b/mbedtls/chachapoly.h → mbedtls3/chachapoly.h
diff --git a/mbedtls/check_config.h → mbedtls3/check_config.h b/mbedtls/check_config.h → mbedtls3/check_config.h
diff --git a/mbedtls/check_crypto_config.h → mbedtls3/check_crypto_config.h b/mbedtls/check_crypto_config.h → mbedtls3/check_crypto_config.h
diff --git a/mbedtls/cipher.c → mbedtls3/cipher.c b/mbedtls/cipher.c → mbedtls3/cipher.c
diff --git a/mbedtls/cipher.h → mbedtls3/cipher.h b/mbedtls/cipher.h → mbedtls3/cipher.h
diff --git a/mbedtls/cipher_wrap.c → mbedtls3/cipher_wrap.c b/mbedtls/cipher_wrap.c → mbedtls3/cipher_wrap.c
diff --git a/mbedtls/cipher_wrap.h → mbedtls3/cipher_wrap.h b/mbedtls/cipher_wrap.h → mbedtls3/cipher_wrap.h
diff --git a/mbedtls/cmac.c → mbedtls3/cmac.c b/mbedtls/cmac.c → mbedtls3/cmac.c
diff --git a/mbedtls/cmac.h → mbedtls3/cmac.h b/mbedtls/cmac.h → mbedtls3/cmac.h
diff --git a/mbedtls/common.h → mbedtls3/common.h b/mbedtls/common.h → mbedtls3/common.h
diff --git a/mbedtls/compat-2.x.h → mbedtls3/compat-2.x.h b/mbedtls/compat-2.x.h → mbedtls3/compat-2.x.h
diff --git a/mbedtls/config_adjust_legacy_crypto.h → mbedtls3/config_adjust_legacy_crypto.h b/mbedtls/config_adjust_legacy_crypto.h → mbedtls3/config_adjust_legacy_crypto.h
diff --git a/mbedtls/config_adjust_legacy_from_psa.h → mbedtls3/config_adjust_legacy_from_psa.h b/mbedtls/config_adjust_legacy_from_psa.h → mbedtls3/config_adjust_legacy_from_psa.h
diff --git a/mbedtls/config_adjust_psa_from_legacy.h → mbedtls3/config_adjust_psa_from_legacy.h b/mbedtls/config_adjust_psa_from_legacy.h → mbedtls3/config_adjust_psa_from_legacy.h
diff --git a/mbedtls/config_adjust_psa_superset_legacy.h → mbedtls3/config_adjust_psa_superset_legacy.h b/mbedtls/config_adjust_psa_superset_legacy.h → mbedtls3/config_adjust_psa_superset_legacy.h
diff --git a/mbedtls/config_adjust_ssl.h → mbedtls3/config_adjust_ssl.h b/mbedtls/config_adjust_ssl.h → mbedtls3/config_adjust_ssl.h
diff --git a/mbedtls/config_adjust_x509.h → mbedtls3/config_adjust_x509.h b/mbedtls/config_adjust_x509.h → mbedtls3/config_adjust_x509.h
diff --git a/mbedtls/config_psa.h → mbedtls3/config_psa.h b/mbedtls/config_psa.h → mbedtls3/config_psa.h
diff --git a/mbedtls/constant_time.c → mbedtls3/constant_time.c b/mbedtls/constant_time.c → mbedtls3/constant_time.c
diff --git a/mbedtls/constant_time.h → mbedtls3/constant_time.h b/mbedtls/constant_time.h → mbedtls3/constant_time.h
diff --git a/mbedtls/constant_time_impl.h → mbedtls3/constant_time_impl.h b/mbedtls/constant_time_impl.h → mbedtls3/constant_time_impl.h
diff --git a/mbedtls/constant_time_internal.h → mbedtls3/constant_time_internal.h b/mbedtls/constant_time_internal.h → mbedtls3/constant_time_internal.h
diff --git a/mbedtls/ctr.h → mbedtls3/ctr.h b/mbedtls/ctr.h → mbedtls3/ctr.h
diff --git a/mbedtls/ctr_drbg.c → mbedtls3/ctr_drbg.c b/mbedtls/ctr_drbg.c → mbedtls3/ctr_drbg.c
diff --git a/mbedtls/ctr_drbg.h → mbedtls3/ctr_drbg.h b/mbedtls/ctr_drbg.h → mbedtls3/ctr_drbg.h
diff --git a/mbedtls/debug.c → mbedtls3/debug.c b/mbedtls/debug.c → mbedtls3/debug.c
diff --git a/mbedtls/debug.h → mbedtls3/debug.h b/mbedtls/debug.h → mbedtls3/debug.h
diff --git a/mbedtls/debug_internal.h → mbedtls3/debug_internal.h b/mbedtls/debug_internal.h → mbedtls3/debug_internal.h
diff --git a/mbedtls/des.c → mbedtls3/des.c b/mbedtls/des.c → mbedtls3/des.c
diff --git a/mbedtls/des.h → mbedtls3/des.h b/mbedtls/des.h → mbedtls3/des.h
diff --git a/mbedtls/dhm.c → mbedtls3/dhm.c b/mbedtls/dhm.c → mbedtls3/dhm.c
diff --git a/mbedtls/dhm.h → mbedtls3/dhm.h b/mbedtls/dhm.h → mbedtls3/dhm.h
diff --git a/mbedtls/ecdh.c → mbedtls3/ecdh.c b/mbedtls/ecdh.c → mbedtls3/ecdh.c
diff --git a/mbedtls/ecdh.h → mbedtls3/ecdh.h b/mbedtls/ecdh.h → mbedtls3/ecdh.h
diff --git a/mbedtls/ecdsa.c → mbedtls3/ecdsa.c b/mbedtls/ecdsa.c → mbedtls3/ecdsa.c
diff --git a/mbedtls/ecdsa.h → mbedtls3/ecdsa.h b/mbedtls/ecdsa.h → mbedtls3/ecdsa.h
diff --git a/mbedtls/ecjpake.c → mbedtls3/ecjpake.c b/mbedtls/ecjpake.c → mbedtls3/ecjpake.c
diff --git a/mbedtls/ecjpake.h → mbedtls3/ecjpake.h b/mbedtls/ecjpake.h → mbedtls3/ecjpake.h
diff --git a/mbedtls/ecp.c → mbedtls3/ecp.c b/mbedtls/ecp.c → mbedtls3/ecp.c
diff --git a/mbedtls/ecp.h → mbedtls3/ecp.h b/mbedtls/ecp.h → mbedtls3/ecp.h
diff --git a/mbedtls/ecp_curves.c → mbedtls3/ecp_curves.c b/mbedtls/ecp_curves.c → mbedtls3/ecp_curves.c
diff --git a/mbedtls/ecp_curves_new.c → mbedtls3/ecp_curves_new.c b/mbedtls/ecp_curves_new.c → mbedtls3/ecp_curves_new.c
diff --git a/mbedtls/ecp_internal_alt.h → mbedtls3/ecp_internal_alt.h b/mbedtls/ecp_internal_alt.h → mbedtls3/ecp_internal_alt.h
diff --git a/mbedtls/ecp_invasive.h → mbedtls3/ecp_invasive.h b/mbedtls/ecp_invasive.h → mbedtls3/ecp_invasive.h
diff --git a/mbedtls/entropy.c → mbedtls3/entropy.c b/mbedtls/entropy.c → mbedtls3/entropy.c
diff --git a/mbedtls/entropy.h → mbedtls3/entropy.h b/mbedtls/entropy.h → mbedtls3/entropy.h
diff --git a/mbedtls/entropy_poll.c → mbedtls3/entropy_poll.c b/mbedtls/entropy_poll.c → mbedtls3/entropy_poll.c
diff --git a/mbedtls/entropy_poll.h → mbedtls3/entropy_poll.h b/mbedtls/entropy_poll.h → mbedtls3/entropy_poll.h
diff --git a/mbedtls/error.c → mbedtls3/error.c b/mbedtls/error.c → mbedtls3/error.c
diff --git a/mbedtls/error.h → mbedtls3/error.h b/mbedtls/error.h → mbedtls3/error.h
diff --git a/mbedtls/gcm.c → mbedtls3/gcm.c b/mbedtls/gcm.c → mbedtls3/gcm.c
diff --git a/mbedtls/gcm.h → mbedtls3/gcm.h b/mbedtls/gcm.h → mbedtls3/gcm.h
diff --git a/mbedtls/hkdf.c → mbedtls3/hkdf.c b/mbedtls/hkdf.c → mbedtls3/hkdf.c
diff --git a/mbedtls/hkdf.h → mbedtls3/hkdf.h b/mbedtls/hkdf.h → mbedtls3/hkdf.h
diff --git a/mbedtls/hmac_drbg.c → mbedtls3/hmac_drbg.c b/mbedtls/hmac_drbg.c → mbedtls3/hmac_drbg.c
diff --git a/mbedtls/hmac_drbg.h → mbedtls3/hmac_drbg.h b/mbedtls/hmac_drbg.h → mbedtls3/hmac_drbg.h
diff --git a/mbedtls/lmots.c → mbedtls3/lmots.c b/mbedtls/lmots.c → mbedtls3/lmots.c
diff --git a/mbedtls/lmots.h → mbedtls3/lmots.h b/mbedtls/lmots.h → mbedtls3/lmots.h
diff --git a/mbedtls/lms.c → mbedtls3/lms.c b/mbedtls/lms.c → mbedtls3/lms.c
diff --git a/mbedtls/lms.h → mbedtls3/lms.h b/mbedtls/lms.h → mbedtls3/lms.h
diff --git a/mbedtls/mbedtls_config.h → mbedtls3/mbedtls_config.h b/mbedtls/mbedtls_config.h → mbedtls3/mbedtls_config.h
diff --git a/mbedtls/md.c → mbedtls3/md.c b/mbedtls/md.c → mbedtls3/md.c
diff --git a/mbedtls/md.h → mbedtls3/md.h b/mbedtls/md.h → mbedtls3/md.h
diff --git a/mbedtls/md5.c → mbedtls3/md5.c b/mbedtls/md5.c → mbedtls3/md5.c
diff --git a/mbedtls/md5.h → mbedtls3/md5.h b/mbedtls/md5.h → mbedtls3/md5.h
diff --git a/mbedtls/md_psa.h → mbedtls3/md_psa.h b/mbedtls/md_psa.h → mbedtls3/md_psa.h
diff --git a/mbedtls/md_wrap.h → mbedtls3/md_wrap.h b/mbedtls/md_wrap.h → mbedtls3/md_wrap.h
diff --git a/mbedtls/memory_buffer_alloc.c → mbedtls3/memory_buffer_alloc.c b/mbedtls/memory_buffer_alloc.c → mbedtls3/memory_buffer_alloc.c
diff --git a/mbedtls/memory_buffer_alloc.h → mbedtls3/memory_buffer_alloc.h b/mbedtls/memory_buffer_alloc.h → mbedtls3/memory_buffer_alloc.h
diff --git a/mbedtls/mps_common.h → mbedtls3/mps_common.h b/mbedtls/mps_common.h → mbedtls3/mps_common.h
diff --git a/mbedtls/mps_error.h → mbedtls3/mps_error.h b/mbedtls/mps_error.h → mbedtls3/mps_error.h
diff --git a/mbedtls/mps_reader.c → mbedtls3/mps_reader.c b/mbedtls/mps_reader.c → mbedtls3/mps_reader.c
diff --git a/mbedtls/mps_reader.h → mbedtls3/mps_reader.h b/mbedtls/mps_reader.h → mbedtls3/mps_reader.h
diff --git a/mbedtls/mps_trace.c → mbedtls3/mps_trace.c b/mbedtls/mps_trace.c → mbedtls3/mps_trace.c
diff --git a/mbedtls/mps_trace.h → mbedtls3/mps_trace.h b/mbedtls/mps_trace.h → mbedtls3/mps_trace.h
diff --git a/mbedtls/net_sockets.c → mbedtls3/net_sockets.c b/mbedtls/net_sockets.c → mbedtls3/net_sockets.c
diff --git a/mbedtls/net_sockets.h → mbedtls3/net_sockets.h b/mbedtls/net_sockets.h → mbedtls3/net_sockets.h
diff --git a/mbedtls/nist_kw.c → mbedtls3/nist_kw.c b/mbedtls/nist_kw.c → mbedtls3/nist_kw.c
diff --git a/mbedtls/nist_kw.h → mbedtls3/nist_kw.h b/mbedtls/nist_kw.h → mbedtls3/nist_kw.h
diff --git a/mbedtls/oid.c → mbedtls3/oid.c b/mbedtls/oid.c → mbedtls3/oid.c
diff --git a/mbedtls/oid.h → mbedtls3/oid.h b/mbedtls/oid.h → mbedtls3/oid.h
diff --git a/mbedtls/padlock.c → mbedtls3/padlock.c b/mbedtls/padlock.c → mbedtls3/padlock.c
diff --git a/mbedtls/padlock.h → mbedtls3/padlock.h b/mbedtls/padlock.h → mbedtls3/padlock.h
diff --git a/mbedtls/pem.c → mbedtls3/pem.c b/mbedtls/pem.c → mbedtls3/pem.c
diff --git a/mbedtls/pem.h → mbedtls3/pem.h b/mbedtls/pem.h → mbedtls3/pem.h
diff --git a/mbedtls/pk.c → mbedtls3/pk.c b/mbedtls/pk.c → mbedtls3/pk.c
diff --git a/mbedtls/pk.h → mbedtls3/pk.h b/mbedtls/pk.h → mbedtls3/pk.h
diff --git a/mbedtls/pk_ecc.c → mbedtls3/pk_ecc.c b/mbedtls/pk_ecc.c → mbedtls3/pk_ecc.c
diff --git a/mbedtls/pk_internal.h → mbedtls3/pk_internal.h b/mbedtls/pk_internal.h → mbedtls3/pk_internal.h
diff --git a/mbedtls/pk_wrap.c → mbedtls3/pk_wrap.c b/mbedtls/pk_wrap.c → mbedtls3/pk_wrap.c
diff --git a/mbedtls/pk_wrap.h → mbedtls3/pk_wrap.h b/mbedtls/pk_wrap.h → mbedtls3/pk_wrap.h
diff --git a/mbedtls/pkcs12.c → mbedtls3/pkcs12.c b/mbedtls/pkcs12.c → mbedtls3/pkcs12.c
diff --git a/mbedtls/pkcs12.h → mbedtls3/pkcs12.h b/mbedtls/pkcs12.h → mbedtls3/pkcs12.h
diff --git a/mbedtls/pkcs5.c → mbedtls3/pkcs5.c b/mbedtls/pkcs5.c → mbedtls3/pkcs5.c
diff --git a/mbedtls/pkcs5.h → mbedtls3/pkcs5.h b/mbedtls/pkcs5.h → mbedtls3/pkcs5.h
diff --git a/mbedtls/pkcs7.c → mbedtls3/pkcs7.c b/mbedtls/pkcs7.c → mbedtls3/pkcs7.c
diff --git a/mbedtls/pkcs7.h → mbedtls3/pkcs7.h b/mbedtls/pkcs7.h → mbedtls3/pkcs7.h
diff --git a/mbedtls/pkparse.c → mbedtls3/pkparse.c b/mbedtls/pkparse.c → mbedtls3/pkparse.c
diff --git a/mbedtls/pkwrite.c → mbedtls3/pkwrite.c b/mbedtls/pkwrite.c → mbedtls3/pkwrite.c
diff --git a/mbedtls/pkwrite.h → mbedtls3/pkwrite.h b/mbedtls/pkwrite.h → mbedtls3/pkwrite.h