mbedtls: 2.28.1 -> 3.2.1

3 files changed, 32 insertions, 47 deletions

diff --git a/mbedtls/.footprint b/mbedtls/.footprint
index 85637d7c2..58eebd62c 100644
--- a/mbedtls/.footprint
+++ b/mbedtls/.footprint
@@ -1,9 +1,11 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/aead_demo
 -rwxr-xr-x	root/root	usr/bin/benchmark
 -rwxr-xr-x	root/root	usr/bin/cert_app
 -rwxr-xr-x	root/root	usr/bin/cert_req
 -rwxr-xr-x	root/root	usr/bin/cert_write
+-rwxr-xr-x	root/root	usr/bin/cipher_aead_demo
 -rwxr-xr-x	root/root	usr/bin/crl_app
 -rwxr-xr-x	root/root	usr/bin/crypt_and_hash
 -rwxr-xr-x	root/root	usr/bin/crypto_examples
@@ -17,14 +19,15 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gen_entropy
 -rwxr-xr-x	root/root	usr/bin/gen_key
 -rwxr-xr-x	root/root	usr/bin/gen_random_ctr_drbg
--rwxr-xr-x	root/root	usr/bin/gen_random_havege
 -rwxr-xr-x	root/root	usr/bin/generic_sum
 -rwxr-xr-x	root/root	usr/bin/hello
+-rwxr-xr-x	root/root	usr/bin/hmac_demo
 -rwxr-xr-x	root/root	usr/bin/key_app
 -rwxr-xr-x	root/root	usr/bin/key_app_writer
 -rwxr-xr-x	root/root	usr/bin/key_ladder_demo
 -rwxr-xr-x	root/root	usr/bin/key_ladder_demo.sh
 -rwxr-xr-x	root/root	usr/bin/load_roots
+-rwxr-xr-x	root/root	usr/bin/md_hmac_demo
 -rwxr-xr-x	root/root	usr/bin/mini_client
 -rwxr-xr-x	root/root	usr/bin/mpi_demo
 -rwxr-xr-x	root/root	usr/bin/pem2der
@@ -54,29 +57,28 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/strerror
 -rwxr-xr-x	root/root	usr/bin/udp_proxy
 -rwxr-xr-x	root/root	usr/bin/zeroize
+drwxr-xr-x	root/root	usr/cmake/
+-rw-r--r--	root/root	usr/cmake/MbedTLSConfig.cmake
+-rw-r--r--	root/root	usr/cmake/MbedTLSConfigVersion.cmake
+-rw-r--r--	root/root	usr/cmake/MbedTLSTargets-release.cmake
+-rw-r--r--	root/root	usr/cmake/MbedTLSTargets.cmake
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/mbedtls/
 -rw-r--r--	root/root	usr/include/mbedtls/aes.h
--rw-r--r--	root/root	usr/include/mbedtls/aesni.h
--rw-r--r--	root/root	usr/include/mbedtls/arc4.h
 -rw-r--r--	root/root	usr/include/mbedtls/aria.h
 -rw-r--r--	root/root	usr/include/mbedtls/asn1.h
 -rw-r--r--	root/root	usr/include/mbedtls/asn1write.h
 -rw-r--r--	root/root	usr/include/mbedtls/base64.h
 -rw-r--r--	root/root	usr/include/mbedtls/bignum.h
--rw-r--r--	root/root	usr/include/mbedtls/blowfish.h
--rw-r--r--	root/root	usr/include/mbedtls/bn_mul.h
+-rw-r--r--	root/root	usr/include/mbedtls/build_info.h
 -rw-r--r--	root/root	usr/include/mbedtls/camellia.h
 -rw-r--r--	root/root	usr/include/mbedtls/ccm.h
--rw-r--r--	root/root	usr/include/mbedtls/certs.h
 -rw-r--r--	root/root	usr/include/mbedtls/chacha20.h
 -rw-r--r--	root/root	usr/include/mbedtls/chachapoly.h
 -rw-r--r--	root/root	usr/include/mbedtls/check_config.h
 -rw-r--r--	root/root	usr/include/mbedtls/cipher.h
--rw-r--r--	root/root	usr/include/mbedtls/cipher_internal.h
 -rw-r--r--	root/root	usr/include/mbedtls/cmac.h
--rw-r--r--	root/root	usr/include/mbedtls/compat-1.3.h
--rw-r--r--	root/root	usr/include/mbedtls/config.h
+-rw-r--r--	root/root	usr/include/mbedtls/compat-2.x.h
 -rw-r--r--	root/root	usr/include/mbedtls/config_psa.h
 -rw-r--r--	root/root	usr/include/mbedtls/constant_time.h
 -rw-r--r--	root/root	usr/include/mbedtls/ctr_drbg.h
@@ -87,39 +89,30 @@ drwxr-xr-x	root/root	usr/include/mbedtls/
 -rw-r--r--	root/root	usr/include/mbedtls/ecdsa.h
 -rw-r--r--	root/root	usr/include/mbedtls/ecjpake.h
 -rw-r--r--	root/root	usr/include/mbedtls/ecp.h
--rw-r--r--	root/root	usr/include/mbedtls/ecp_internal.h
 -rw-r--r--	root/root	usr/include/mbedtls/entropy.h
--rw-r--r--	root/root	usr/include/mbedtls/entropy_poll.h
 -rw-r--r--	root/root	usr/include/mbedtls/error.h
 -rw-r--r--	root/root	usr/include/mbedtls/gcm.h
--rw-r--r--	root/root	usr/include/mbedtls/havege.h
 -rw-r--r--	root/root	usr/include/mbedtls/hkdf.h
 -rw-r--r--	root/root	usr/include/mbedtls/hmac_drbg.h
+-rw-r--r--	root/root	usr/include/mbedtls/mbedtls_config.h
 -rw-r--r--	root/root	usr/include/mbedtls/md.h
--rw-r--r--	root/root	usr/include/mbedtls/md2.h
--rw-r--r--	root/root	usr/include/mbedtls/md4.h
 -rw-r--r--	root/root	usr/include/mbedtls/md5.h
--rw-r--r--	root/root	usr/include/mbedtls/md_internal.h
 -rw-r--r--	root/root	usr/include/mbedtls/memory_buffer_alloc.h
--rw-r--r--	root/root	usr/include/mbedtls/net.h
 -rw-r--r--	root/root	usr/include/mbedtls/net_sockets.h
 -rw-r--r--	root/root	usr/include/mbedtls/nist_kw.h
 -rw-r--r--	root/root	usr/include/mbedtls/oid.h
--rw-r--r--	root/root	usr/include/mbedtls/padlock.h
 -rw-r--r--	root/root	usr/include/mbedtls/pem.h
 -rw-r--r--	root/root	usr/include/mbedtls/pk.h
--rw-r--r--	root/root	usr/include/mbedtls/pk_internal.h
--rw-r--r--	root/root	usr/include/mbedtls/pkcs11.h
 -rw-r--r--	root/root	usr/include/mbedtls/pkcs12.h
 -rw-r--r--	root/root	usr/include/mbedtls/pkcs5.h
 -rw-r--r--	root/root	usr/include/mbedtls/platform.h
 -rw-r--r--	root/root	usr/include/mbedtls/platform_time.h
 -rw-r--r--	root/root	usr/include/mbedtls/platform_util.h
 -rw-r--r--	root/root	usr/include/mbedtls/poly1305.h
+-rw-r--r--	root/root	usr/include/mbedtls/private_access.h
 -rw-r--r--	root/root	usr/include/mbedtls/psa_util.h
 -rw-r--r--	root/root	usr/include/mbedtls/ripemd160.h
 -rw-r--r--	root/root	usr/include/mbedtls/rsa.h
--rw-r--r--	root/root	usr/include/mbedtls/rsa_internal.h
 -rw-r--r--	root/root	usr/include/mbedtls/sha1.h
 -rw-r--r--	root/root	usr/include/mbedtls/sha256.h
 -rw-r--r--	root/root	usr/include/mbedtls/sha512.h
@@ -127,7 +120,6 @@ drwxr-xr-x	root/root	usr/include/mbedtls/
 -rw-r--r--	root/root	usr/include/mbedtls/ssl_cache.h
 -rw-r--r--	root/root	usr/include/mbedtls/ssl_ciphersuites.h
 -rw-r--r--	root/root	usr/include/mbedtls/ssl_cookie.h
--rw-r--r--	root/root	usr/include/mbedtls/ssl_internal.h
 -rw-r--r--	root/root	usr/include/mbedtls/ssl_ticket.h
 -rw-r--r--	root/root	usr/include/mbedtls/threading.h
 -rw-r--r--	root/root	usr/include/mbedtls/timing.h
@@ -136,7 +128,6 @@ drwxr-xr-x	root/root	usr/include/mbedtls/
 -rw-r--r--	root/root	usr/include/mbedtls/x509_crl.h
 -rw-r--r--	root/root	usr/include/mbedtls/x509_crt.h
 -rw-r--r--	root/root	usr/include/mbedtls/x509_csr.h
--rw-r--r--	root/root	usr/include/mbedtls/xtea.h
 drwxr-xr-x	root/root	usr/include/psa/
 -rw-r--r--	root/root	usr/include/psa/crypto.h
 -rw-r--r--	root/root	usr/include/psa/crypto_builtin_composites.h
@@ -153,16 +144,16 @@ drwxr-xr-x	root/root	usr/include/psa/
 -rw-r--r--	root/root	usr/include/psa/crypto_struct.h
 -rw-r--r--	root/root	usr/include/psa/crypto_types.h
 -rw-r--r--	root/root	usr/include/psa/crypto_values.h
-drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libmbedcrypto.a
-lrwxrwxrwx	root/root	usr/lib/libmbedcrypto.so -> libmbedcrypto.so.7
--rw-r--r--	root/root	usr/lib/libmbedcrypto.so.2.28.1
-lrwxrwxrwx	root/root	usr/lib/libmbedcrypto.so.7 -> libmbedcrypto.so.2.28.1
--rw-r--r--	root/root	usr/lib/libmbedtls.a
-lrwxrwxrwx	root/root	usr/lib/libmbedtls.so -> libmbedtls.so.14
-lrwxrwxrwx	root/root	usr/lib/libmbedtls.so.14 -> libmbedtls.so.2.28.1
--rw-r--r--	root/root	usr/lib/libmbedtls.so.2.28.1
--rw-r--r--	root/root	usr/lib/libmbedx509.a
-lrwxrwxrwx	root/root	usr/lib/libmbedx509.so -> libmbedx509.so.1
-lrwxrwxrwx	root/root	usr/lib/libmbedx509.so.1 -> libmbedx509.so.2.28.1
--rw-r--r--	root/root	usr/lib/libmbedx509.so.2.28.1
+drwxr-xr-x	root/root	usr/lib64/
+-rw-r--r--	root/root	usr/lib64/libmbedcrypto.a
+lrwxrwxrwx	root/root	usr/lib64/libmbedcrypto.so -> libmbedcrypto.so.12
+lrwxrwxrwx	root/root	usr/lib64/libmbedcrypto.so.12 -> libmbedcrypto.so.3.2.1
+-rwxr-xr-x	root/root	usr/lib64/libmbedcrypto.so.3.2.1
+-rw-r--r--	root/root	usr/lib64/libmbedtls.a
+lrwxrwxrwx	root/root	usr/lib64/libmbedtls.so -> libmbedtls.so.18
+lrwxrwxrwx	root/root	usr/lib64/libmbedtls.so.18 -> libmbedtls.so.3.2.1
+-rwxr-xr-x	root/root	usr/lib64/libmbedtls.so.3.2.1
+-rw-r--r--	root/root	usr/lib64/libmbedx509.a
+lrwxrwxrwx	root/root	usr/lib64/libmbedx509.so -> libmbedx509.so.4
+-rwxr-xr-x	root/root	usr/lib64/libmbedx509.so.3.2.1
+lrwxrwxrwx	root/root	usr/lib64/libmbedx509.so.4 -> libmbedx509.so.3.2.1
diff --git a/mbedtls/.signature b/mbedtls/.signature
index 3b6a0e33b..1831c5072 100644
--- a/mbedtls/.signature
+++ b/mbedtls/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31EGElKMqBMxs4kdjK6+RkuEuLT1k4FgZE5ngEcrjD8OtNQ8mzV1Avvly0xgTRU0qSgCcfF0jvxjaI7KwmlW3Ac=
-SHA256 (Pkgfile) = 0874fe747a03117d85540c6bdf6dbf09571c4086fa0beb40632817a328f8e1aa
-SHA256 (.footprint) = d2142aa32540767df748315e08d13ab7d191b8800348aad94bc2b9224507ca52
-SHA256 (mbedtls-2.28.1.tar.gz) = 82ff5fda18ecbdee9053bdbeed6059c89e487f3024227131657d4c4536735ed1
+RWSagIOpLGJF30YNb8L02k18kVxtXEbkPBH/c5nd6CSrcbmNM0S4dnvz4cXovBkBLTCLURkQpANkS2030VUBtKXDfk5rRFrpzgE=
+SHA256 (Pkgfile) = afbb0ac30e22a881c9b339d51397810d47430b6a944b3076e82258cca221c128
+SHA256 (.footprint) = 949f4f6cb69cb5a13aed13bec2845c9eb84f75be2347b321b1a3c64f86be68dd
+SHA256 (mbedtls-3.2.1.tar.gz) = 5850089672560eeaca03dc36678ee8573bb48ef6e38c94f5ce349af60c16da33
diff --git a/mbedtls/Pkgfile b/mbedtls/Pkgfile
index 5751098aa..a5f56fd89 100644
--- a/mbedtls/Pkgfile
+++ b/mbedtls/Pkgfile
@@ -1,20 +1,14 @@
 # Description: Cryptographic library for embedded systems
 # URL: https://tls.mbed.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: cmake python3
+# Depends on: python3
 
 name=mbedtls
-version=2.28.1
+version=3.2.1
 release=1
 source=(https://github.com/ARMmbed/mbedtls/archive/$name-$version.tar.gz)
 
 build() {
-	# enable flags for non-embedded systems
-	sed -i 's|//\(#define MBEDTLS_HAVE_SSE2\)|\1|' $name-$name-$version/include/mbedtls/config.h
-	sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' $name-$name-$version/include/mbedtls/config.h
-	sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' $name-$name-$version/include/mbedtls/config.h
-	sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' $name-$name-$version/include/mbedtls/config.h
-
 	cmake -S $name-$name-$version -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_BUILD_TYPE=Release \