MbedTLS 3.x is now put by default in folder "mbedtls".

Not sure if having symbolic link is such a good idaa. Reason: Having a symbolic llink just now gives distribution errors. #944
bibledit · Jul 28, 2024 · 3aa3742 · 3aa3742
1 parent b76268d
commit 3aa3742
Show file tree

Hide file tree

Showing 245 changed files with 4 additions and 7 deletions.
diff --git a/0readme.txt b/0readme.txt
@@ -6,12 +6,11 @@ MbedTLS
 
 The source tree contains two versions of MbedTLS.
 * MbedTLS 2.x in folder mbedtls2.
-* MbedTLS 3.x in folder mbedtls3.
+* MbedTLS 3.x in folder mbedtls.
 
 Switching between the two versions can be done as follows.
-1. Make a soft link from folder mbedtls2 or mbedtls3 to mbedtls:
-   $ rm mbedtls
-   $ ln -s mbedtls3 mbedtls
+1. Put the desired version of MbedTLS in folder "mbedtls".
+   This may involve a rename operation.
 2. Put the relevant source code in Makefile.am.
    The source code is listed below for both versions.
 

diff --git a/mbedtls b/mbedtls
diff --git a/mbedtls3/0readme.txt → mbedtls/0readme.txt b/mbedtls3/0readme.txt → mbedtls/0readme.txt
diff --git a/mbedtls3/aes.c → mbedtls/aes.c b/mbedtls3/aes.c → mbedtls/aes.c
diff --git a/mbedtls3/aes.h → mbedtls/aes.h b/mbedtls3/aes.h → mbedtls/aes.h
diff --git a/mbedtls3/aesce.c → mbedtls/aesce.c b/mbedtls3/aesce.c → mbedtls/aesce.c
diff --git a/mbedtls3/aesce.h → mbedtls/aesce.h b/mbedtls3/aesce.h → mbedtls/aesce.h
diff --git a/mbedtls3/aesni.c → mbedtls/aesni.c b/mbedtls3/aesni.c → mbedtls/aesni.c
diff --git a/mbedtls3/aesni.h → mbedtls/aesni.h b/mbedtls3/aesni.h → mbedtls/aesni.h
diff --git a/mbedtls3/alignment.h → mbedtls/alignment.h b/mbedtls3/alignment.h → mbedtls/alignment.h
diff --git a/mbedtls3/aria.c → mbedtls/aria.c b/mbedtls3/aria.c → mbedtls/aria.c
diff --git a/mbedtls3/aria.h → mbedtls/aria.h b/mbedtls3/aria.h → mbedtls/aria.h
diff --git a/mbedtls3/asn1.h → mbedtls/asn1.h b/mbedtls3/asn1.h → mbedtls/asn1.h
diff --git a/mbedtls3/asn1parse.c → mbedtls/asn1parse.c b/mbedtls3/asn1parse.c → mbedtls/asn1parse.c
diff --git a/mbedtls3/asn1write.c → mbedtls/asn1write.c b/mbedtls3/asn1write.c → mbedtls/asn1write.c
diff --git a/mbedtls3/asn1write.h → mbedtls/asn1write.h b/mbedtls3/asn1write.h → mbedtls/asn1write.h
diff --git a/mbedtls3/base64.c → mbedtls/base64.c b/mbedtls3/base64.c → mbedtls/base64.c
diff --git a/mbedtls3/base64.h → mbedtls/base64.h b/mbedtls3/base64.h → mbedtls/base64.h
diff --git a/mbedtls3/base64_internal.h → mbedtls/base64_internal.h b/mbedtls3/base64_internal.h → mbedtls/base64_internal.h
diff --git a/mbedtls3/bignum.c → mbedtls/bignum.c b/mbedtls3/bignum.c → mbedtls/bignum.c
diff --git a/mbedtls3/bignum.h → mbedtls/bignum.h b/mbedtls3/bignum.h → mbedtls/bignum.h
diff --git a/mbedtls3/bignum_core.c → mbedtls/bignum_core.c b/mbedtls3/bignum_core.c → mbedtls/bignum_core.c
diff --git a/mbedtls3/bignum_core.h → mbedtls/bignum_core.h b/mbedtls3/bignum_core.h → mbedtls/bignum_core.h
diff --git a/mbedtls3/bignum_mod.c → mbedtls/bignum_mod.c b/mbedtls3/bignum_mod.c → mbedtls/bignum_mod.c
diff --git a/mbedtls3/bignum_mod.h → mbedtls/bignum_mod.h b/mbedtls3/bignum_mod.h → mbedtls/bignum_mod.h
diff --git a/mbedtls3/bignum_mod_raw.c → mbedtls/bignum_mod_raw.c b/mbedtls3/bignum_mod_raw.c → mbedtls/bignum_mod_raw.c
diff --git a/mbedtls3/bignum_mod_raw.h → mbedtls/bignum_mod_raw.h b/mbedtls3/bignum_mod_raw.h → mbedtls/bignum_mod_raw.h
diff --git a/mbedtls3/bignum_mod_raw_invasive.h → mbedtls/bignum_mod_raw_invasive.h b/mbedtls3/bignum_mod_raw_invasive.h → mbedtls/bignum_mod_raw_invasive.h
diff --git a/mbedtls3/block_cipher.c → mbedtls/block_cipher.c b/mbedtls3/block_cipher.c → mbedtls/block_cipher.c
diff --git a/mbedtls3/block_cipher.h → mbedtls/block_cipher.h b/mbedtls3/block_cipher.h → mbedtls/block_cipher.h
diff --git a/mbedtls3/block_cipher_internal.h → mbedtls/block_cipher_internal.h b/mbedtls3/block_cipher_internal.h → mbedtls/block_cipher_internal.h
diff --git a/mbedtls3/bn_mul.h → mbedtls/bn_mul.h b/mbedtls3/bn_mul.h → mbedtls/bn_mul.h
diff --git a/mbedtls3/build_info.h → mbedtls/build_info.h b/mbedtls3/build_info.h → mbedtls/build_info.h
diff --git a/mbedtls3/camellia.c → mbedtls/camellia.c b/mbedtls3/camellia.c → mbedtls/camellia.c
diff --git a/mbedtls3/camellia.h → mbedtls/camellia.h b/mbedtls3/camellia.h → mbedtls/camellia.h
diff --git a/mbedtls3/ccm.c → mbedtls/ccm.c b/mbedtls3/ccm.c → mbedtls/ccm.c
diff --git a/mbedtls3/ccm.h → mbedtls/ccm.h b/mbedtls3/ccm.h → mbedtls/ccm.h
diff --git a/mbedtls3/chacha20.c → mbedtls/chacha20.c b/mbedtls3/chacha20.c → mbedtls/chacha20.c
diff --git a/mbedtls3/chacha20.h → mbedtls/chacha20.h b/mbedtls3/chacha20.h → mbedtls/chacha20.h
diff --git a/mbedtls3/chachapoly.c → mbedtls/chachapoly.c b/mbedtls3/chachapoly.c → mbedtls/chachapoly.c
diff --git a/mbedtls3/chachapoly.h → mbedtls/chachapoly.h b/mbedtls3/chachapoly.h → mbedtls/chachapoly.h
diff --git a/mbedtls3/check_config.h → mbedtls/check_config.h b/mbedtls3/check_config.h → mbedtls/check_config.h
diff --git a/mbedtls3/check_crypto_config.h → mbedtls/check_crypto_config.h b/mbedtls3/check_crypto_config.h → mbedtls/check_crypto_config.h
diff --git a/mbedtls3/cipher.c → mbedtls/cipher.c b/mbedtls3/cipher.c → mbedtls/cipher.c
diff --git a/mbedtls3/cipher.h → mbedtls/cipher.h b/mbedtls3/cipher.h → mbedtls/cipher.h
diff --git a/mbedtls3/cipher_wrap.c → mbedtls/cipher_wrap.c b/mbedtls3/cipher_wrap.c → mbedtls/cipher_wrap.c
diff --git a/mbedtls3/cipher_wrap.h → mbedtls/cipher_wrap.h b/mbedtls3/cipher_wrap.h → mbedtls/cipher_wrap.h
diff --git a/mbedtls3/cmac.c → mbedtls/cmac.c b/mbedtls3/cmac.c → mbedtls/cmac.c
diff --git a/mbedtls3/cmac.h → mbedtls/cmac.h b/mbedtls3/cmac.h → mbedtls/cmac.h
diff --git a/mbedtls3/common.h → mbedtls/common.h b/mbedtls3/common.h → mbedtls/common.h
diff --git a/mbedtls3/compat-2.x.h → mbedtls/compat-2.x.h b/mbedtls3/compat-2.x.h → mbedtls/compat-2.x.h
diff --git a/mbedtls3/config_adjust_legacy_crypto.h → mbedtls/config_adjust_legacy_crypto.h b/mbedtls3/config_adjust_legacy_crypto.h → mbedtls/config_adjust_legacy_crypto.h
diff --git a/mbedtls3/config_adjust_legacy_from_psa.h → mbedtls/config_adjust_legacy_from_psa.h b/mbedtls3/config_adjust_legacy_from_psa.h → mbedtls/config_adjust_legacy_from_psa.h
diff --git a/mbedtls3/config_adjust_psa_from_legacy.h → mbedtls/config_adjust_psa_from_legacy.h b/mbedtls3/config_adjust_psa_from_legacy.h → mbedtls/config_adjust_psa_from_legacy.h
diff --git a/mbedtls3/config_adjust_psa_superset_legacy.h → mbedtls/config_adjust_psa_superset_legacy.h b/mbedtls3/config_adjust_psa_superset_legacy.h → mbedtls/config_adjust_psa_superset_legacy.h
diff --git a/mbedtls3/config_adjust_ssl.h → mbedtls/config_adjust_ssl.h b/mbedtls3/config_adjust_ssl.h → mbedtls/config_adjust_ssl.h
diff --git a/mbedtls3/config_adjust_x509.h → mbedtls/config_adjust_x509.h b/mbedtls3/config_adjust_x509.h → mbedtls/config_adjust_x509.h
diff --git a/mbedtls3/config_psa.h → mbedtls/config_psa.h b/mbedtls3/config_psa.h → mbedtls/config_psa.h
diff --git a/mbedtls3/constant_time.c → mbedtls/constant_time.c b/mbedtls3/constant_time.c → mbedtls/constant_time.c
diff --git a/mbedtls3/constant_time.h → mbedtls/constant_time.h b/mbedtls3/constant_time.h → mbedtls/constant_time.h
diff --git a/mbedtls3/constant_time_impl.h → mbedtls/constant_time_impl.h b/mbedtls3/constant_time_impl.h → mbedtls/constant_time_impl.h
diff --git a/mbedtls3/constant_time_internal.h → mbedtls/constant_time_internal.h b/mbedtls3/constant_time_internal.h → mbedtls/constant_time_internal.h
diff --git a/mbedtls3/ctr.h → mbedtls/ctr.h b/mbedtls3/ctr.h → mbedtls/ctr.h
diff --git a/mbedtls3/ctr_drbg.c → mbedtls/ctr_drbg.c b/mbedtls3/ctr_drbg.c → mbedtls/ctr_drbg.c
diff --git a/mbedtls3/ctr_drbg.h → mbedtls/ctr_drbg.h b/mbedtls3/ctr_drbg.h → mbedtls/ctr_drbg.h
diff --git a/mbedtls3/debug.c → mbedtls/debug.c b/mbedtls3/debug.c → mbedtls/debug.c
diff --git a/mbedtls3/debug.h → mbedtls/debug.h b/mbedtls3/debug.h → mbedtls/debug.h
diff --git a/mbedtls3/debug_internal.h → mbedtls/debug_internal.h b/mbedtls3/debug_internal.h → mbedtls/debug_internal.h
diff --git a/mbedtls3/des.c → mbedtls/des.c b/mbedtls3/des.c → mbedtls/des.c
diff --git a/mbedtls3/des.h → mbedtls/des.h b/mbedtls3/des.h → mbedtls/des.h
diff --git a/mbedtls3/dhm.c → mbedtls/dhm.c b/mbedtls3/dhm.c → mbedtls/dhm.c
diff --git a/mbedtls3/dhm.h → mbedtls/dhm.h b/mbedtls3/dhm.h → mbedtls/dhm.h
diff --git a/mbedtls3/ecdh.c → mbedtls/ecdh.c b/mbedtls3/ecdh.c → mbedtls/ecdh.c
diff --git a/mbedtls3/ecdh.h → mbedtls/ecdh.h b/mbedtls3/ecdh.h → mbedtls/ecdh.h
diff --git a/mbedtls3/ecdsa.c → mbedtls/ecdsa.c b/mbedtls3/ecdsa.c → mbedtls/ecdsa.c
diff --git a/mbedtls3/ecdsa.h → mbedtls/ecdsa.h b/mbedtls3/ecdsa.h → mbedtls/ecdsa.h
diff --git a/mbedtls3/ecjpake.c → mbedtls/ecjpake.c b/mbedtls3/ecjpake.c → mbedtls/ecjpake.c
diff --git a/mbedtls3/ecjpake.h → mbedtls/ecjpake.h b/mbedtls3/ecjpake.h → mbedtls/ecjpake.h
diff --git a/mbedtls3/ecp.c → mbedtls/ecp.c b/mbedtls3/ecp.c → mbedtls/ecp.c
diff --git a/mbedtls3/ecp.h → mbedtls/ecp.h b/mbedtls3/ecp.h → mbedtls/ecp.h
diff --git a/mbedtls3/ecp_curves.c → mbedtls/ecp_curves.c b/mbedtls3/ecp_curves.c → mbedtls/ecp_curves.c
diff --git a/mbedtls3/ecp_curves_new.c → mbedtls/ecp_curves_new.c b/mbedtls3/ecp_curves_new.c → mbedtls/ecp_curves_new.c
diff --git a/mbedtls3/ecp_internal_alt.h → mbedtls/ecp_internal_alt.h b/mbedtls3/ecp_internal_alt.h → mbedtls/ecp_internal_alt.h
diff --git a/mbedtls3/ecp_invasive.h → mbedtls/ecp_invasive.h b/mbedtls3/ecp_invasive.h → mbedtls/ecp_invasive.h
diff --git a/mbedtls3/entropy.c → mbedtls/entropy.c b/mbedtls3/entropy.c → mbedtls/entropy.c
diff --git a/mbedtls3/entropy.h → mbedtls/entropy.h b/mbedtls3/entropy.h → mbedtls/entropy.h
diff --git a/mbedtls3/entropy_poll.c → mbedtls/entropy_poll.c b/mbedtls3/entropy_poll.c → mbedtls/entropy_poll.c
diff --git a/mbedtls3/entropy_poll.h → mbedtls/entropy_poll.h b/mbedtls3/entropy_poll.h → mbedtls/entropy_poll.h
diff --git a/mbedtls3/error.c → mbedtls/error.c b/mbedtls3/error.c → mbedtls/error.c
diff --git a/mbedtls3/error.h → mbedtls/error.h b/mbedtls3/error.h → mbedtls/error.h
diff --git a/mbedtls3/gcm.c → mbedtls/gcm.c b/mbedtls3/gcm.c → mbedtls/gcm.c
diff --git a/mbedtls3/gcm.h → mbedtls/gcm.h b/mbedtls3/gcm.h → mbedtls/gcm.h
diff --git a/mbedtls3/hkdf.c → mbedtls/hkdf.c b/mbedtls3/hkdf.c → mbedtls/hkdf.c
diff --git a/mbedtls3/hkdf.h → mbedtls/hkdf.h b/mbedtls3/hkdf.h → mbedtls/hkdf.h
diff --git a/mbedtls3/hmac_drbg.c → mbedtls/hmac_drbg.c b/mbedtls3/hmac_drbg.c → mbedtls/hmac_drbg.c
diff --git a/mbedtls3/hmac_drbg.h → mbedtls/hmac_drbg.h b/mbedtls3/hmac_drbg.h → mbedtls/hmac_drbg.h
diff --git a/mbedtls3/lmots.c → mbedtls/lmots.c b/mbedtls3/lmots.c → mbedtls/lmots.c
diff --git a/mbedtls3/lmots.h → mbedtls/lmots.h b/mbedtls3/lmots.h → mbedtls/lmots.h
diff --git a/mbedtls3/lms.c → mbedtls/lms.c b/mbedtls3/lms.c → mbedtls/lms.c
diff --git a/mbedtls3/lms.h → mbedtls/lms.h b/mbedtls3/lms.h → mbedtls/lms.h
diff --git a/mbedtls3/mbedtls_config.h → mbedtls/mbedtls_config.h b/mbedtls3/mbedtls_config.h → mbedtls/mbedtls_config.h
diff --git a/mbedtls3/md.c → mbedtls/md.c b/mbedtls3/md.c → mbedtls/md.c
diff --git a/mbedtls3/md.h → mbedtls/md.h b/mbedtls3/md.h → mbedtls/md.h
diff --git a/mbedtls3/md5.c → mbedtls/md5.c b/mbedtls3/md5.c → mbedtls/md5.c
diff --git a/mbedtls3/md5.h → mbedtls/md5.h b/mbedtls3/md5.h → mbedtls/md5.h
diff --git a/mbedtls3/md_psa.h → mbedtls/md_psa.h b/mbedtls3/md_psa.h → mbedtls/md_psa.h
diff --git a/mbedtls3/md_wrap.h → mbedtls/md_wrap.h b/mbedtls3/md_wrap.h → mbedtls/md_wrap.h
diff --git a/mbedtls3/memory_buffer_alloc.c → mbedtls/memory_buffer_alloc.c b/mbedtls3/memory_buffer_alloc.c → mbedtls/memory_buffer_alloc.c
diff --git a/mbedtls3/memory_buffer_alloc.h → mbedtls/memory_buffer_alloc.h b/mbedtls3/memory_buffer_alloc.h → mbedtls/memory_buffer_alloc.h
diff --git a/mbedtls3/mps_common.h → mbedtls/mps_common.h b/mbedtls3/mps_common.h → mbedtls/mps_common.h
diff --git a/mbedtls3/mps_error.h → mbedtls/mps_error.h b/mbedtls3/mps_error.h → mbedtls/mps_error.h
diff --git a/mbedtls3/mps_reader.c → mbedtls/mps_reader.c b/mbedtls3/mps_reader.c → mbedtls/mps_reader.c
diff --git a/mbedtls3/mps_reader.h → mbedtls/mps_reader.h b/mbedtls3/mps_reader.h → mbedtls/mps_reader.h
diff --git a/mbedtls3/mps_trace.c → mbedtls/mps_trace.c b/mbedtls3/mps_trace.c → mbedtls/mps_trace.c
diff --git a/mbedtls3/mps_trace.h → mbedtls/mps_trace.h b/mbedtls3/mps_trace.h → mbedtls/mps_trace.h
diff --git a/mbedtls3/net_sockets.c → mbedtls/net_sockets.c b/mbedtls3/net_sockets.c → mbedtls/net_sockets.c
diff --git a/mbedtls3/net_sockets.h → mbedtls/net_sockets.h b/mbedtls3/net_sockets.h → mbedtls/net_sockets.h
diff --git a/mbedtls3/nist_kw.c → mbedtls/nist_kw.c b/mbedtls3/nist_kw.c → mbedtls/nist_kw.c
diff --git a/mbedtls3/nist_kw.h → mbedtls/nist_kw.h b/mbedtls3/nist_kw.h → mbedtls/nist_kw.h
diff --git a/mbedtls3/oid.c → mbedtls/oid.c b/mbedtls3/oid.c → mbedtls/oid.c
diff --git a/mbedtls3/oid.h → mbedtls/oid.h b/mbedtls3/oid.h → mbedtls/oid.h
diff --git a/mbedtls3/padlock.c → mbedtls/padlock.c b/mbedtls3/padlock.c → mbedtls/padlock.c
diff --git a/mbedtls3/padlock.h → mbedtls/padlock.h b/mbedtls3/padlock.h → mbedtls/padlock.h
diff --git a/mbedtls3/pem.c → mbedtls/pem.c b/mbedtls3/pem.c → mbedtls/pem.c
diff --git a/mbedtls3/pem.h → mbedtls/pem.h b/mbedtls3/pem.h → mbedtls/pem.h
diff --git a/mbedtls3/pk.c → mbedtls/pk.c b/mbedtls3/pk.c → mbedtls/pk.c
diff --git a/mbedtls3/pk.h → mbedtls/pk.h b/mbedtls3/pk.h → mbedtls/pk.h
diff --git a/mbedtls3/pk_ecc.c → mbedtls/pk_ecc.c b/mbedtls3/pk_ecc.c → mbedtls/pk_ecc.c
diff --git a/mbedtls3/pk_internal.h → mbedtls/pk_internal.h b/mbedtls3/pk_internal.h → mbedtls/pk_internal.h
diff --git a/mbedtls3/pk_wrap.c → mbedtls/pk_wrap.c b/mbedtls3/pk_wrap.c → mbedtls/pk_wrap.c
diff --git a/mbedtls3/pk_wrap.h → mbedtls/pk_wrap.h b/mbedtls3/pk_wrap.h → mbedtls/pk_wrap.h
diff --git a/mbedtls3/pkcs12.c → mbedtls/pkcs12.c b/mbedtls3/pkcs12.c → mbedtls/pkcs12.c
diff --git a/mbedtls3/pkcs12.h → mbedtls/pkcs12.h b/mbedtls3/pkcs12.h → mbedtls/pkcs12.h
diff --git a/mbedtls3/pkcs5.c → mbedtls/pkcs5.c b/mbedtls3/pkcs5.c → mbedtls/pkcs5.c
diff --git a/mbedtls3/pkcs5.h → mbedtls/pkcs5.h b/mbedtls3/pkcs5.h → mbedtls/pkcs5.h
diff --git a/mbedtls3/pkcs7.c → mbedtls/pkcs7.c b/mbedtls3/pkcs7.c → mbedtls/pkcs7.c
diff --git a/mbedtls3/pkcs7.h → mbedtls/pkcs7.h b/mbedtls3/pkcs7.h → mbedtls/pkcs7.h
diff --git a/mbedtls3/pkparse.c → mbedtls/pkparse.c b/mbedtls3/pkparse.c → mbedtls/pkparse.c
diff --git a/mbedtls3/pkwrite.c → mbedtls/pkwrite.c b/mbedtls3/pkwrite.c → mbedtls/pkwrite.c
diff --git a/mbedtls3/pkwrite.h → mbedtls/pkwrite.h b/mbedtls3/pkwrite.h → mbedtls/pkwrite.h
diff --git a/mbedtls3/platform.c → mbedtls/platform.c b/mbedtls3/platform.c → mbedtls/platform.c
diff --git a/mbedtls3/platform.h → mbedtls/platform.h b/mbedtls3/platform.h → mbedtls/platform.h
diff --git a/mbedtls3/platform_time.h → mbedtls/platform_time.h b/mbedtls3/platform_time.h → mbedtls/platform_time.h
diff --git a/mbedtls3/platform_util.c → mbedtls/platform_util.c b/mbedtls3/platform_util.c → mbedtls/platform_util.c
diff --git a/mbedtls3/platform_util.h → mbedtls/platform_util.h b/mbedtls3/platform_util.h → mbedtls/platform_util.h
diff --git a/mbedtls3/poly1305.c → mbedtls/poly1305.c b/mbedtls3/poly1305.c → mbedtls/poly1305.c
diff --git a/mbedtls3/poly1305.h → mbedtls/poly1305.h b/mbedtls3/poly1305.h → mbedtls/poly1305.h
diff --git a/mbedtls3/private_access.h → mbedtls/private_access.h b/mbedtls3/private_access.h → mbedtls/private_access.h
diff --git a/mbedtls3/psa_crypto.c → mbedtls/psa_crypto.c b/mbedtls3/psa_crypto.c → mbedtls/psa_crypto.c
diff --git a/mbedtls3/psa_crypto_aead.c → mbedtls/psa_crypto_aead.c b/mbedtls3/psa_crypto_aead.c → mbedtls/psa_crypto_aead.c
diff --git a/mbedtls3/psa_crypto_aead.h → mbedtls/psa_crypto_aead.h b/mbedtls3/psa_crypto_aead.h → mbedtls/psa_crypto_aead.h
diff --git a/mbedtls3/psa_crypto_cipher.c → mbedtls/psa_crypto_cipher.c b/mbedtls3/psa_crypto_cipher.c → mbedtls/psa_crypto_cipher.c
diff --git a/mbedtls3/psa_crypto_cipher.h → mbedtls/psa_crypto_cipher.h b/mbedtls3/psa_crypto_cipher.h → mbedtls/psa_crypto_cipher.h
diff --git a/mbedtls3/psa_crypto_client.c → mbedtls/psa_crypto_client.c b/mbedtls3/psa_crypto_client.c → mbedtls/psa_crypto_client.c
diff --git a/mbedtls3/psa_crypto_core.h → mbedtls/psa_crypto_core.h b/mbedtls3/psa_crypto_core.h → mbedtls/psa_crypto_core.h
diff --git a/mbedtls3/psa_crypto_core_common.h → mbedtls/psa_crypto_core_common.h b/mbedtls3/psa_crypto_core_common.h → mbedtls/psa_crypto_core_common.h
diff --git a/mbedtls3/psa_crypto_driver_wrappers.h → mbedtls/psa_crypto_driver_wrappers.h b/mbedtls3/psa_crypto_driver_wrappers.h → mbedtls/psa_crypto_driver_wrappers.h
diff --git a/...s3/psa_crypto_driver_wrappers_no_static.c → ...ls/psa_crypto_driver_wrappers_no_static.c b/...s3/psa_crypto_driver_wrappers_no_static.c → ...ls/psa_crypto_driver_wrappers_no_static.c
diff --git a/...s3/psa_crypto_driver_wrappers_no_static.h → ...ls/psa_crypto_driver_wrappers_no_static.h b/...s3/psa_crypto_driver_wrappers_no_static.h → ...ls/psa_crypto_driver_wrappers_no_static.h
diff --git a/mbedtls3/psa_crypto_ecp.c → mbedtls/psa_crypto_ecp.c b/mbedtls3/psa_crypto_ecp.c → mbedtls/psa_crypto_ecp.c
diff --git a/mbedtls3/psa_crypto_ecp.h → mbedtls/psa_crypto_ecp.h b/mbedtls3/psa_crypto_ecp.h → mbedtls/psa_crypto_ecp.h
diff --git a/mbedtls3/psa_crypto_ffdh.c → mbedtls/psa_crypto_ffdh.c b/mbedtls3/psa_crypto_ffdh.c → mbedtls/psa_crypto_ffdh.c
diff --git a/mbedtls3/psa_crypto_ffdh.h → mbedtls/psa_crypto_ffdh.h b/mbedtls3/psa_crypto_ffdh.h → mbedtls/psa_crypto_ffdh.h
diff --git a/mbedtls3/psa_crypto_hash.c → mbedtls/psa_crypto_hash.c b/mbedtls3/psa_crypto_hash.c → mbedtls/psa_crypto_hash.c
diff --git a/mbedtls3/psa_crypto_hash.h → mbedtls/psa_crypto_hash.h b/mbedtls3/psa_crypto_hash.h → mbedtls/psa_crypto_hash.h
diff --git a/mbedtls3/psa_crypto_invasive.h → mbedtls/psa_crypto_invasive.h b/mbedtls3/psa_crypto_invasive.h → mbedtls/psa_crypto_invasive.h
diff --git a/mbedtls3/psa_crypto_its.h → mbedtls/psa_crypto_its.h b/mbedtls3/psa_crypto_its.h → mbedtls/psa_crypto_its.h
diff --git a/mbedtls3/psa_crypto_mac.c → mbedtls/psa_crypto_mac.c b/mbedtls3/psa_crypto_mac.c → mbedtls/psa_crypto_mac.c
diff --git a/mbedtls3/psa_crypto_mac.h → mbedtls/psa_crypto_mac.h b/mbedtls3/psa_crypto_mac.h → mbedtls/psa_crypto_mac.h
diff --git a/mbedtls3/psa_crypto_pake.c → mbedtls/psa_crypto_pake.c b/mbedtls3/psa_crypto_pake.c → mbedtls/psa_crypto_pake.c
diff --git a/mbedtls3/psa_crypto_pake.h → mbedtls/psa_crypto_pake.h b/mbedtls3/psa_crypto_pake.h → mbedtls/psa_crypto_pake.h
diff --git a/mbedtls3/psa_crypto_random_impl.h → mbedtls/psa_crypto_random_impl.h b/mbedtls3/psa_crypto_random_impl.h → mbedtls/psa_crypto_random_impl.h
diff --git a/mbedtls3/psa_crypto_rsa.c → mbedtls/psa_crypto_rsa.c b/mbedtls3/psa_crypto_rsa.c → mbedtls/psa_crypto_rsa.c
diff --git a/mbedtls3/psa_crypto_rsa.h → mbedtls/psa_crypto_rsa.h b/mbedtls3/psa_crypto_rsa.h → mbedtls/psa_crypto_rsa.h
diff --git a/mbedtls3/psa_crypto_se.c → mbedtls/psa_crypto_se.c b/mbedtls3/psa_crypto_se.c → mbedtls/psa_crypto_se.c
diff --git a/mbedtls3/psa_crypto_se.h → mbedtls/psa_crypto_se.h b/mbedtls3/psa_crypto_se.h → mbedtls/psa_crypto_se.h
diff --git a/mbedtls3/psa_crypto_slot_management.c → mbedtls/psa_crypto_slot_management.c b/mbedtls3/psa_crypto_slot_management.c → mbedtls/psa_crypto_slot_management.c
diff --git a/mbedtls3/psa_crypto_slot_management.h → mbedtls/psa_crypto_slot_management.h b/mbedtls3/psa_crypto_slot_management.h → mbedtls/psa_crypto_slot_management.h
diff --git a/mbedtls3/psa_crypto_storage.c → mbedtls/psa_crypto_storage.c b/mbedtls3/psa_crypto_storage.c → mbedtls/psa_crypto_storage.c
diff --git a/mbedtls3/psa_crypto_storage.h → mbedtls/psa_crypto_storage.h b/mbedtls3/psa_crypto_storage.h → mbedtls/psa_crypto_storage.h
diff --git a/mbedtls3/psa_its_file.c → mbedtls/psa_its_file.c b/mbedtls3/psa_its_file.c → mbedtls/psa_its_file.c
diff --git a/mbedtls3/psa_util.c → mbedtls/psa_util.c b/mbedtls3/psa_util.c → mbedtls/psa_util.c
diff --git a/mbedtls3/psa_util.h → mbedtls/psa_util.h b/mbedtls3/psa_util.h → mbedtls/psa_util.h
diff --git a/mbedtls3/psa_util_internal.h → mbedtls/psa_util_internal.h b/mbedtls3/psa_util_internal.h → mbedtls/psa_util_internal.h
diff --git a/mbedtls3/ripemd160.c → mbedtls/ripemd160.c b/mbedtls3/ripemd160.c → mbedtls/ripemd160.c
diff --git a/mbedtls3/ripemd160.h → mbedtls/ripemd160.h b/mbedtls3/ripemd160.h → mbedtls/ripemd160.h
diff --git a/mbedtls3/rsa.c → mbedtls/rsa.c b/mbedtls3/rsa.c → mbedtls/rsa.c
diff --git a/mbedtls3/rsa.h → mbedtls/rsa.h b/mbedtls3/rsa.h → mbedtls/rsa.h
diff --git a/mbedtls3/rsa_alt_helpers.c → mbedtls/rsa_alt_helpers.c b/mbedtls3/rsa_alt_helpers.c → mbedtls/rsa_alt_helpers.c
diff --git a/mbedtls3/rsa_alt_helpers.h → mbedtls/rsa_alt_helpers.h b/mbedtls3/rsa_alt_helpers.h → mbedtls/rsa_alt_helpers.h
diff --git a/mbedtls3/rsa_internal.h → mbedtls/rsa_internal.h b/mbedtls3/rsa_internal.h → mbedtls/rsa_internal.h
diff --git a/mbedtls3/sha1.c → mbedtls/sha1.c b/mbedtls3/sha1.c → mbedtls/sha1.c
diff --git a/mbedtls3/sha1.h → mbedtls/sha1.h b/mbedtls3/sha1.h → mbedtls/sha1.h
diff --git a/mbedtls3/sha256.c → mbedtls/sha256.c b/mbedtls3/sha256.c → mbedtls/sha256.c
diff --git a/mbedtls3/sha256.h → mbedtls/sha256.h b/mbedtls3/sha256.h → mbedtls/sha256.h
diff --git a/mbedtls3/sha3.c → mbedtls/sha3.c b/mbedtls3/sha3.c → mbedtls/sha3.c
diff --git a/mbedtls3/sha3.h → mbedtls/sha3.h b/mbedtls3/sha3.h → mbedtls/sha3.h
diff --git a/mbedtls3/sha512.c → mbedtls/sha512.c b/mbedtls3/sha512.c → mbedtls/sha512.c
diff --git a/mbedtls3/sha512.h → mbedtls/sha512.h b/mbedtls3/sha512.h → mbedtls/sha512.h
diff --git a/mbedtls3/ssl.h → mbedtls/ssl.h b/mbedtls3/ssl.h → mbedtls/ssl.h
diff --git a/mbedtls3/ssl_cache.c → mbedtls/ssl_cache.c b/mbedtls3/ssl_cache.c → mbedtls/ssl_cache.c
diff --git a/mbedtls3/ssl_cache.h → mbedtls/ssl_cache.h b/mbedtls3/ssl_cache.h → mbedtls/ssl_cache.h
diff --git a/mbedtls3/ssl_ciphersuites.c → mbedtls/ssl_ciphersuites.c b/mbedtls3/ssl_ciphersuites.c → mbedtls/ssl_ciphersuites.c
diff --git a/mbedtls3/ssl_ciphersuites.h → mbedtls/ssl_ciphersuites.h b/mbedtls3/ssl_ciphersuites.h → mbedtls/ssl_ciphersuites.h
diff --git a/mbedtls3/ssl_ciphersuites_internal.h → mbedtls/ssl_ciphersuites_internal.h b/mbedtls3/ssl_ciphersuites_internal.h → mbedtls/ssl_ciphersuites_internal.h
diff --git a/mbedtls3/ssl_client.c → mbedtls/ssl_client.c b/mbedtls3/ssl_client.c → mbedtls/ssl_client.c
diff --git a/mbedtls3/ssl_client.h → mbedtls/ssl_client.h b/mbedtls3/ssl_client.h → mbedtls/ssl_client.h
diff --git a/mbedtls3/ssl_cookie.c → mbedtls/ssl_cookie.c b/mbedtls3/ssl_cookie.c → mbedtls/ssl_cookie.c
diff --git a/mbedtls3/ssl_cookie.h → mbedtls/ssl_cookie.h b/mbedtls3/ssl_cookie.h → mbedtls/ssl_cookie.h
diff --git a/mbedtls3/ssl_debug_helpers.h → mbedtls/ssl_debug_helpers.h b/mbedtls3/ssl_debug_helpers.h → mbedtls/ssl_debug_helpers.h
diff --git a/mbedtls3/ssl_debug_helpers_generated.c → mbedtls/ssl_debug_helpers_generated.c b/mbedtls3/ssl_debug_helpers_generated.c → mbedtls/ssl_debug_helpers_generated.c
diff --git a/mbedtls3/ssl_misc.h → mbedtls/ssl_misc.h b/mbedtls3/ssl_misc.h → mbedtls/ssl_misc.h
diff --git a/mbedtls3/ssl_msg.c → mbedtls/ssl_msg.c b/mbedtls3/ssl_msg.c → mbedtls/ssl_msg.c
diff --git a/mbedtls3/ssl_ticket.c → mbedtls/ssl_ticket.c b/mbedtls3/ssl_ticket.c → mbedtls/ssl_ticket.c
diff --git a/mbedtls3/ssl_ticket.h → mbedtls/ssl_ticket.h b/mbedtls3/ssl_ticket.h → mbedtls/ssl_ticket.h
diff --git a/mbedtls3/ssl_tls.c → mbedtls/ssl_tls.c b/mbedtls3/ssl_tls.c → mbedtls/ssl_tls.c
diff --git a/mbedtls3/ssl_tls12_client.c → mbedtls/ssl_tls12_client.c b/mbedtls3/ssl_tls12_client.c → mbedtls/ssl_tls12_client.c
diff --git a/mbedtls3/ssl_tls12_server.c → mbedtls/ssl_tls12_server.c b/mbedtls3/ssl_tls12_server.c → mbedtls/ssl_tls12_server.c
diff --git a/mbedtls3/ssl_tls13_client.c → mbedtls/ssl_tls13_client.c b/mbedtls3/ssl_tls13_client.c → mbedtls/ssl_tls13_client.c
diff --git a/mbedtls3/ssl_tls13_generic.c → mbedtls/ssl_tls13_generic.c b/mbedtls3/ssl_tls13_generic.c → mbedtls/ssl_tls13_generic.c
diff --git a/mbedtls3/ssl_tls13_invasive.h → mbedtls/ssl_tls13_invasive.h b/mbedtls3/ssl_tls13_invasive.h → mbedtls/ssl_tls13_invasive.h
diff --git a/mbedtls3/ssl_tls13_keys.c → mbedtls/ssl_tls13_keys.c b/mbedtls3/ssl_tls13_keys.c → mbedtls/ssl_tls13_keys.c
diff --git a/mbedtls3/ssl_tls13_keys.h → mbedtls/ssl_tls13_keys.h b/mbedtls3/ssl_tls13_keys.h → mbedtls/ssl_tls13_keys.h
diff --git a/mbedtls3/ssl_tls13_server.c → mbedtls/ssl_tls13_server.c b/mbedtls3/ssl_tls13_server.c → mbedtls/ssl_tls13_server.c
diff --git a/mbedtls3/threading.c → mbedtls/threading.c b/mbedtls3/threading.c → mbedtls/threading.c
diff --git a/mbedtls3/threading.h → mbedtls/threading.h b/mbedtls3/threading.h → mbedtls/threading.h
diff --git a/mbedtls3/timing.c → mbedtls/timing.c b/mbedtls3/timing.c → mbedtls/timing.c
diff --git a/mbedtls3/timing.h → mbedtls/timing.h b/mbedtls3/timing.h → mbedtls/timing.h
diff --git a/mbedtls3/version.c → mbedtls/version.c b/mbedtls3/version.c → mbedtls/version.c
diff --git a/mbedtls3/version.h → mbedtls/version.h b/mbedtls3/version.h → mbedtls/version.h
diff --git a/mbedtls3/version_features.c → mbedtls/version_features.c b/mbedtls3/version_features.c → mbedtls/version_features.c
diff --git a/mbedtls3/x509.c → mbedtls/x509.c b/mbedtls3/x509.c → mbedtls/x509.c
diff --git a/mbedtls3/x509.h → mbedtls/x509.h b/mbedtls3/x509.h → mbedtls/x509.h
diff --git a/mbedtls3/x509_create.c → mbedtls/x509_create.c b/mbedtls3/x509_create.c → mbedtls/x509_create.c
diff --git a/mbedtls3/x509_crl.c → mbedtls/x509_crl.c b/mbedtls3/x509_crl.c → mbedtls/x509_crl.c
diff --git a/mbedtls3/x509_crl.h → mbedtls/x509_crl.h b/mbedtls3/x509_crl.h → mbedtls/x509_crl.h
diff --git a/mbedtls3/x509_crt.c → mbedtls/x509_crt.c b/mbedtls3/x509_crt.c → mbedtls/x509_crt.c
diff --git a/mbedtls3/x509_crt.h → mbedtls/x509_crt.h b/mbedtls3/x509_crt.h → mbedtls/x509_crt.h
diff --git a/mbedtls3/x509_csr.c → mbedtls/x509_csr.c b/mbedtls3/x509_csr.c → mbedtls/x509_csr.c
diff --git a/mbedtls3/x509_csr.h → mbedtls/x509_csr.h b/mbedtls3/x509_csr.h → mbedtls/x509_csr.h
diff --git a/mbedtls3/x509_internal.h → mbedtls/x509_internal.h b/mbedtls3/x509_internal.h → mbedtls/x509_internal.h
diff --git a/mbedtls3/x509write.c → mbedtls/x509write.c b/mbedtls3/x509write.c → mbedtls/x509write.c
diff --git a/mbedtls3/x509write_crt.c → mbedtls/x509write_crt.c b/mbedtls3/x509write_crt.c → mbedtls/x509write_crt.c
diff --git a/mbedtls3/x509write_csr.c → mbedtls/x509write_csr.c b/mbedtls3/x509write_csr.c → mbedtls/x509write_csr.c
diff --git a/pkgdata/files.txt b/pkgdata/files.txt
@@ -397,10 +397,9 @@
 /mapping/Spanish.txt
 /mapping/Vulgate.txt
 /mbedtls
+/mbedtls/0readme.txt
 /mbedtls2
 /mbedtls2/0readme.txt
-/mbedtls3
-/mbedtls3/0readme.txt
 /menu
 /microtar
 /microtar/LICENSE