mbedtls: 2.26.0 -> 2.28.1

3 files changed, 20 insertions, 17 deletions

diff --git a/mbedtls/.footprint b/mbedtls/.footprint
index 8d5360dec..85637d7c2 100644
--- a/mbedtls/.footprint
+++ b/mbedtls/.footprint
@@ -1,6 +1,5 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/aescrypt2
 -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
@@ -25,6 +24,7 @@ drwxr-xr-x	root/root	usr/bin/
 -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/mini_client
 -rwxr-xr-x	root/root	usr/bin/mpi_demo
 -rwxr-xr-x	root/root	usr/bin/pem2der
@@ -78,6 +78,7 @@ drwxr-xr-x	root/root	usr/include/mbedtls/
 -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/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
 -rw-r--r--	root/root	usr/include/mbedtls/debug.h
 -rw-r--r--	root/root	usr/include/mbedtls/des.h
@@ -138,9 +139,13 @@ drwxr-xr-x	root/root	usr/include/mbedtls/
 -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
+-rw-r--r--	root/root	usr/include/psa/crypto_builtin_primitives.h
 -rw-r--r--	root/root	usr/include/psa/crypto_compat.h
 -rw-r--r--	root/root	usr/include/psa/crypto_config.h
 -rw-r--r--	root/root	usr/include/psa/crypto_driver_common.h
+-rw-r--r--	root/root	usr/include/psa/crypto_driver_contexts_composites.h
+-rw-r--r--	root/root	usr/include/psa/crypto_driver_contexts_primitives.h
 -rw-r--r--	root/root	usr/include/psa/crypto_extra.h
 -rw-r--r--	root/root	usr/include/psa/crypto_platform.h
 -rw-r--r--	root/root	usr/include/psa/crypto_se_driver.h
@@ -150,14 +155,14 @@ drwxr-xr-x	root/root	usr/include/psa/
 -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.6
--rw-r--r--	root/root	usr/lib/libmbedcrypto.so.2.26.0
-lrwxrwxrwx	root/root	usr/lib/libmbedcrypto.so.6 -> libmbedcrypto.so.2.26.0
+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.13
-lrwxrwxrwx	root/root	usr/lib/libmbedtls.so.13 -> libmbedtls.so.2.26.0
--rw-r--r--	root/root	usr/lib/libmbedtls.so.2.26.0
+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.26.0
--rw-r--r--	root/root	usr/lib/libmbedx509.so.2.26.0
+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
diff --git a/mbedtls/.signature b/mbedtls/.signature
index be40e547f..3b6a0e33b 100644
--- a/mbedtls/.signature
+++ b/mbedtls/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zp90+329ff4pAIzG2OaJCa+vsFSNR2ScFdR9rME7bfKMNjkCa+lbWCFoVqzQNexbAKFothUFXvbAoeinq+SoQg=
-SHA256 (Pkgfile) = 35ee98b563276451f613d2ed961b93d7326b2ab3f131c2a9b7097426b65cdd5d
-SHA256 (.footprint) = bd8cc3890a84bbf2b1cf54e9aec70d6106be67f9dbb6b926311e2314642e6d9b
-SHA256 (mbedtls-2.26.0.tar.gz) = 35d8d87509cd0d002bddbd5508b9d2b931c5e83747d087234cc7ad551d53fe05
+RWSagIOpLGJF31EGElKMqBMxs4kdjK6+RkuEuLT1k4FgZE5ngEcrjD8OtNQ8mzV1Avvly0xgTRU0qSgCcfF0jvxjaI7KwmlW3Ac=
+SHA256 (Pkgfile) = 0874fe747a03117d85540c6bdf6dbf09571c4086fa0beb40632817a328f8e1aa
+SHA256 (.footprint) = d2142aa32540767df748315e08d13ab7d191b8800348aad94bc2b9224507ca52
+SHA256 (mbedtls-2.28.1.tar.gz) = 82ff5fda18ecbdee9053bdbeed6059c89e487f3024227131657d4c4536735ed1
diff --git a/mbedtls/Pkgfile b/mbedtls/Pkgfile
index 2663d71a0..5751098aa 100644
--- a/mbedtls/Pkgfile
+++ b/mbedtls/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: cmake python3
 
 name=mbedtls
-version=2.26.0
+version=2.28.1
 release=1
 source=(https://github.com/ARMmbed/mbedtls/archive/$name-$version.tar.gz)
 
@@ -15,9 +15,7 @@ build() {
 	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
 
-	[[ -e '/usr/bin/ninja' ]] && PKGMK_MBEDTLS+=' -G Ninja'
-
-	cmake -S $name-$name-$version -B build $PKGMK_MBEDTLS \
+	cmake -S $name-$name-$version -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \