security/mbedtls: Update to 2.28.0 and fix make test

Also bump dependent ports for library version change.

PR:		255084

28 files changed, 101 insertions, 704 deletions

diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index de51922736a9..2e739bdf12bf 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libarchive
 DISTVERSION=	3.5.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile
index a5d0c8811989..46cec897971a 100644
--- a/biology/ncbi-vdb/Makefile
+++ b/biology/ncbi-vdb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ncbi-vdb
 DISTVERSION=	2.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 
 MAINTAINER=	mzaki@niid.go.jp
diff --git a/dns/kadnode/Makefile b/dns/kadnode/Makefile
index fc85aa004638..9b601858f559 100644
--- a/dns/kadnode/Makefile
+++ b/dns/kadnode/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	kadnode
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns
 
 MAINTAINER=	moritzwarning@web.de
diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index 43980a09ae9f..d85a3f7a7330 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	imhex
 PORTVERSION=	1.13.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg
 DISTFILES=	xdg.hpp:xdg
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 72df3d84958e..bb05f22a4c48 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	5.0.12716
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index ce4b47a023d5..8d4d70cbee96 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	inspircd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.12.0
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 7dec74e8890e..b582eeae5e44 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gauche
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	https://github.com/shirok/Gauche/releases/download/release0_9_10/
 DISTNAME=	Gauche-${PORTVERSION}
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index f73d82ab2561..52c944f96bfd 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	neko
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2-2-0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang
 
 MAINTAINER=	penzin.dev@gmail.com
diff --git a/multimedia/librist/Makefile b/multimedia/librist/Makefile
index 64be045b8a5c..eac947a2656c 100644
--- a/multimedia/librist/Makefile
+++ b/multimedia/librist/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	librist
 DISTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 2c9436cab492..9044021eb9a4 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	obs-studio
 DISTVERSION=	27.1.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net-im/sayaka/Makefile b/net-im/sayaka/Makefile
index 84a7f9d1bf3e..b11dd3f9e280 100644
--- a/net-im/sayaka/Makefile
+++ b/net-im/sayaka/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sayaka
 PORTVERSION=	3.5.1
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	sue@iwmt.org
diff --git a/net-p2p/btcheck/Makefile b/net-p2p/btcheck/Makefile
index b2e8ed367a0d..e3f024ef8395 100644
--- a/net-p2p/btcheck/Makefile
+++ b/net-p2p/btcheck/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	btcheck
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/net/bctoolbox/Makefile b/net/bctoolbox/Makefile
index 5a44f4ea6a17..801937e3cd57 100644
--- a/net/bctoolbox/Makefile
+++ b/net/bctoolbox/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bctoolbox
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	https://www.linphone.org/releases/sources/bctoolbox/
 
diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile
index 57b8662eeafb..3e1e92044fc9 100644
--- a/net/libwebsockets/Makefile
+++ b/net/libwebsockets/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	libwebsockets
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.2.2
+PORTREVISION=	1
 CATEGORIES=	net devel
 MASTER_SITES=	https://libwebsockets.org/git/libwebsockets/snapshot/
 
diff --git a/net/pichi/Makefile b/net/pichi/Makefile
index a02d8770313e..1a7e5fbb9565 100644
--- a/net/pichi/Makefile
+++ b/net/pichi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pichi
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	pichi@elude.in
diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index 088b0b34ef16..512b5f05f726 100644
--- a/net/shadowsocks-libev/Makefile
+++ b/net/shadowsocks-libev/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	shadowsocks-libev
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	xiaoding+freebsd@xiaoding.org
diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile
index 0b0710bfd1e7..706fc9d672c3 100644
--- a/security/mbedtls/Makefile
+++ b/security/mbedtls/Makefile
@@ -1,27 +1,25 @@
 PORTNAME=	mbedtls
-PORTVERSION=	2.16.12
+PORTVERSION=	2.28.0
 DISTVERSIONPREFIX=${PORTNAME}-
 CATEGORIES=	security devel
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
-LICENSE=	APACHE20 GPLv2+
-LICENSE_COMB=	dual
-LICENSE_FILE_APACHE20=	${WRKSRC}/apache-2.0.txt
-LICENSE_FILE_GPLv2+ =	${WRKSRC}/gpl-2.0.txt
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gmake python:test shebangfix
+SHEBANG_FILES=	scripts/*.py tests/scripts/*.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ARMmbed
 
 ALL_TARGET=	no_test
 TEST_TARGET=	test
-MAKE_ENV=	SHARED=1
-USES=		gmake tar:tgz
+MAKE_ENV=	PYTHON=${PYTHON_CMD} SHARED=1
 USE_LDCONFIG=	yes
 
-CONFLICTS_INSTALL=	polarssl13
-
 post-patch:
 	@${RM} ${WRKSRC}/include/mbedtls/*.orig
 	@${REINPLACE_CMD} \
@@ -31,8 +29,8 @@ post-patch:
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
-	${FIND} ${STAGEDIR}${PREFIX}/bin -type f -not -name \
-		mbedtls_udp_proxy_wrapper.sh -exec ${STRIP_CMD} {} +
+	${FIND} ${STAGEDIR}${PREFIX}/bin -type f -not -name \*.sh \
+		-exec ${STRIP_CMD} {} +
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/security/mbedtls/distinfo b/security/mbedtls/distinfo
index 3dc6ce661998..5fe1b991a8cf 100644
--- a/security/mbedtls/distinfo
+++ b/security/mbedtls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640884497
-SHA256 (ARMmbed-mbedtls-mbedtls-2.16.12_GH0.tar.gz) = 0afb4a4ce5b771f2fb86daee786362fbe48285f05b73cd205f46a224ec031783
-SIZE (ARMmbed-mbedtls-mbedtls-2.16.12_GH0.tar.gz) = 2702190
+TIMESTAMP = 1643369982
+SHA256 (ARMmbed-mbedtls-mbedtls-2.28.0_GH0.tar.gz) = f644248f23cf04315cf9bb58d88c4c9471c16ca0533ecf33f86fb7749a3e5fa6
+SIZE (ARMmbed-mbedtls-mbedtls-2.28.0_GH0.tar.gz) = 3712239
diff --git a/security/mbedtls/files/patch-config.h b/security/mbedtls/files/patch-config.h
deleted file mode 100644
index ef5f7f4e7e03..000000000000
--- a/security/mbedtls/files/patch-config.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/mbedtls/config.h.orig	2017-03-08 15:33:04 UTC
-+++ include/mbedtls/config.h
-@@ -1285,7 +1285,7 @@
-  *
-  * Uncomment this to enable pthread mutexes.
-  */
--//#define MBEDTLS_THREADING_PTHREAD
-+#define MBEDTLS_THREADING_PTHREAD
- 
- /**
-  * \def MBEDTLS_VERSION_FEATURES
-@@ -2322,7 +2322,7 @@
-  *
-  * Enable this layer to allow use of mutexes within mbed TLS
-  */
--//#define MBEDTLS_THREADING_C
-+#define MBEDTLS_THREADING_C
- 
- /**
-  * \def MBEDTLS_TIMING_C
diff --git a/security/mbedtls/files/patch-dtls-srtp b/security/mbedtls/files/patch-dtls-srtp
deleted file mode 100644
index dac835d23b17..000000000000
--- a/security/mbedtls/files/patch-dtls-srtp
+++ /dev/null
@@ -1,659 +0,0 @@
-Add DTLS-SRTP (RFC 5764) support.
-
-Obtained from:	git://git.linphone.org/linphone-desktop.git
-
-diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
-index d1db0d8..72e2d04 100644
---- include/mbedtls/config.h
-+++ include/mbedtls/config.h
-@@ -1154,6 +1154,17 @@
- #define MBEDTLS_SSL_DTLS_HELLO_VERIFY
- 
- /**
-+ * \def MBEDTLS_SSL_DTLS_SRTP
-+ *
-+ * Enable support for DTLS-SRTP, RFC5764
-+ *
-+ * Requires: MBEDTLS_SSL_PROTO_DTLS
-+ *
-+ * Comment this to disable support for DTLS-SRTP.
-+ */
-+#define MBEDTLS_SSL_DTLS_SRTP
-+
-+/**
-  * \def MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
-  *
-  * Enable server-side support for clients that reconnect from the same port.
-diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
-index 00e1c6c..729e95f 100644
---- include/mbedtls/ssl.h
-+++ include/mbedtls/ssl.h
-@@ -326,6 +326,8 @@
- 
- #define MBEDTLS_TLS_EXT_SIG_ALG                     13
- 
-+#define MBEDTLS_TLS_EXT_USE_SRTP                    14
-+
- #define MBEDTLS_TLS_EXT_ALPN                        16
- 
- #define MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC            22 /* 0x16 */
-@@ -338,6 +340,14 @@
- #define MBEDTLS_TLS_EXT_RENEGOTIATION_INFO      0xFF01
- 
- /*
-+ * use_srtp extension protection profiles values as defined in http://www.iana.org/assignments/srtp-protection/srtp-protection.xhtml
-+ */
-+#define MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE     0x0001
-+#define MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE     0x0002
-+#define MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE          0x0005
-+#define MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE          0x0006
-+
-+/*
-  * Size defines
-  */
- #if !defined(MBEDTLS_PSK_MAX_LEN)
-@@ -426,6 +436,19 @@ typedef struct mbedtls_ssl_key_cert mbedtls_ssl_key_cert;
- typedef struct mbedtls_ssl_flight_item mbedtls_ssl_flight_item;
- #endif
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+/*
-+ * List of SRTP profiles for DTLS-SRTP
-+ */
-+enum mbedtls_DTLS_SRTP_protection_profiles {
-+    MBEDTLS_SRTP_UNSET_PROFILE,
-+    MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80,
-+    MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32,
-+    MBEDTLS_SRTP_NULL_HMAC_SHA1_80,
-+    MBEDTLS_SRTP_NULL_HMAC_SHA1_32,
-+};
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- /*
-  * This structure is used for storing current session data.
-  */
-@@ -566,6 +589,14 @@ struct mbedtls_ssl_config
-     const char **alpn_list;         /*!< ordered list of protocols          */
- #endif
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+    /*
-+     * use_srtp extension
-+     */
-+    enum mbedtls_DTLS_SRTP_protection_profiles *dtls_srtp_profiles_list; /*!< ordered list of supported srtp profile */
-+    size_t dtls_srtp_profiles_list_len; /*!< number of supported profiles */
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
-     /*
-      * Numerical settings (int then char)
-      */
-@@ -765,6 +796,15 @@ struct mbedtls_ssl_context
-     const char *alpn_chosen;    /*!<  negotiated protocol                   */
- #endif
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+    /*
-+     * use_srtp extension
-+     */
-+    enum mbedtls_DTLS_SRTP_protection_profiles chosen_dtls_srtp_profile; /*!< negotiated SRTP profile */
-+    unsigned char *dtls_srtp_keys; /*<! master keys and master salt for SRTP generated during handshake */
-+    size_t dtls_srtp_keys_len; /*<! length in bytes of master keys and master salt for SRTP generated during handshake */
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
-     /*
-      * Information for DTLS hello verify
-      */
-@@ -1781,6 +1821,45 @@ int mbedtls_ssl_conf_alpn_protocols( mbedtls_ssl_config *conf, const char **prot
- const char *mbedtls_ssl_get_alpn_protocol( const mbedtls_ssl_context *ssl );
- #endif /* MBEDTLS_SSL_ALPN */
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+/**
-+ * \brief                   Set the supported DTLS-SRTP protection profiles.
-+ *
-+ * \param ssl               SSL configuration
-+ * \param protos            List of supported protection profiles,
-+ *                          in decreasing preference order.
-+ * \param profiles_number   Number of supported profiles.
-+ *
-+ * \return         0 on success, or MBEDTLS_ERR_SSL_BAD_INPUT_DATA.
-+ */
-+int mbedtls_ssl_conf_dtls_srtp_protection_profiles( mbedtls_ssl_config *conf, const enum mbedtls_DTLS_SRTP_protection_profiles *profiles, size_t profiles_number);
-+
-+/**
-+ * \brief          Get the negotiated DTLS-SRTP Protection Profile.
-+ *                 This function should be called after the handshake is
-+ *                 completed.
-+ *
-+ * \param ssl      SSL context
-+ *
-+ * \return         Protection Profile enum member, MBEDTLS_SRTP_UNSET_PROFILE if no protocol was negotiated.
-+ */
-+enum mbedtls_DTLS_SRTP_protection_profiles mbedtls_ssl_get_dtls_srtp_protection_profile( const mbedtls_ssl_context *ssl);
-+
-+/**
-+ * \brief                  Get the generated DTLS-SRTP key material.
-+ *                         This function should be called after the handshake is
-+ *                         completed. It shall returns 80 bytes of key material generated according to RFC5764
-+ *
-+ * \param ssl              SSL context
-+ * \param key              Buffer to hold the generated key material
-+ * \param key_buffer_len   Length in bytes of the key buffer
-+ * \param key_len          Actual length of data written in the key buffer
-+ *
-+ * \return         0 on succes, MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL if the key buffer is too small to hold the generated key
-+ */
-+int mbedtls_ssl_get_dtls_srtp_key_material( const mbedtls_ssl_context *ssl, unsigned char *key, const size_t key_buffer_len, size_t *key_len );
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- /**
-  * \brief          Set the maximum supported version sent from the client side
-  *                 and/or accepted at the server side
-diff --git a/library/ssl_cli.c b/library/ssl_cli.c
-index 4452169..91569ed 100644
---- library/ssl_cli.c
-+++ library/ssl_cli.c
-@@ -656,6 +656,79 @@ static void ssl_write_alpn_ext( mbedtls_ssl_context *ssl,
- }
- #endif /* MBEDTLS_SSL_ALPN */
- 
-+#if defined (MBEDTLS_SSL_DTLS_SRTP)
-+static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl,
-+                                unsigned char *buf, size_t *olen )
-+{
-+    unsigned char *p = buf;
-+    size_t protection_profiles_index = 0;
-+
-+    *olen = 0;
-+
-+    if( (ssl->conf->dtls_srtp_profiles_list == NULL)  || (ssl->conf->dtls_srtp_profiles_list_len == 0) )
-+    {
-+        return;
-+    }
-+
-+    MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding use_srtp extension" ) );
-+
-+    *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_USE_SRTP >> 8 ) & 0xFF );
-+    *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_USE_SRTP      ) & 0xFF );
-+
-+    /* RFC5764 section 4.1.1
-+     * uint8 SRTPProtectionProfile[2];
-+     *
-+     * struct {
-+     *   SRTPProtectionProfiles SRTPProtectionProfiles;
-+     *   opaque srtp_mki<0..255>;
-+     * } UseSRTPData;
-+
-+     * SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1>;
-+     *
-+     * Note: srtp_mki is not supported
-+     */
-+
-+    /* Extension length = 2bytes for profiles lenght, ssl->conf->dtls_srtp_profiles_list_len*2 (each profile is 2 bytes length ) + 1 byte for the non implemented srtp_mki vector length (always 0) */
-+    *p++ = (unsigned char)( ( ( 2 + 2*(ssl->conf->dtls_srtp_profiles_list_len) + 1 ) >> 8 ) & 0xFF );
-+    *p++ = (unsigned char)( ( ( 2 + 2*(ssl->conf->dtls_srtp_profiles_list_len) + 1 )      ) & 0xFF );
-+
-+
-+    /* protection profile length: 2*(ssl->conf->dtls_srtp_profiles_list_len) */
-+    *p++ = (unsigned char)( ( ( 2*(ssl->conf->dtls_srtp_profiles_list_len) ) >> 8 ) & 0xFF );
-+    *p++ = (unsigned char)( ( 2*(ssl->conf->dtls_srtp_profiles_list_len) ) & 0xFF );
-+
-+    for( protection_profiles_index=0; protection_profiles_index < ssl->conf->dtls_srtp_profiles_list_len; protection_profiles_index++ )
-+    {
-+        switch (ssl->conf->dtls_srtp_profiles_list[protection_profiles_index]) {
-+            case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80:
-+                *p++ = ( ( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE ) >> 8 ) & 0xFF);
-+                *p++ = ( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE ) & 0xFF);
-+                break;
-+            case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32:
-+                *p++ = ( ( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE ) >> 8 ) & 0xFF);
-+                *p++ = ( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE ) & 0xFF);
-+                break;
-+            case MBEDTLS_SRTP_NULL_HMAC_SHA1_80:
-+                *p++ = ( ( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE ) >> 8 ) & 0xFF);
-+                *p++ = ( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE ) & 0xFF);
-+                break;
-+            case MBEDTLS_SRTP_NULL_HMAC_SHA1_32:
-+                *p++ = ( ( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE ) >> 8 ) & 0xFF);
-+                *p++ = ( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE ) & 0xFF);
-+                break;
-+            default:
-+                /* Note: we shall never arrive here as protection profiles is checked by ssl_set_dtls_srtp_protection_profiles function */
-+                MBEDTLS_SSL_DEBUG_MSG( 1, ( "client hello, ignore illegal DTLS-SRTP protection profile %d",  ssl->conf->dtls_srtp_profiles_list[protection_profiles_index]) );
-+                break;
-+        }
-+    }
-+
-+    *p++ = 0x00;  /* non implemented srtp_mki vector length is always 0 */
-+    /* total extension length: extension type (2 bytes) + extension length (2 bytes) + protection profile length (2 bytes) + 2*nb protection profiles + srtp_mki vector length(1 byte)*/
-+    *olen = 2 + 2 + 2 + 2*(ssl->conf->dtls_srtp_profiles_list_len) + 1;
-+}
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- /*
-  * Generate random bytes for ClientHello
-  */
-@@ -1006,6 +1079,11 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
-     ext_len += olen;
- #endif
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+    ssl_write_use_srtp_ext( ssl, p + 2 + ext_len, &olen );
-+    ext_len += olen;
-+#endif
-+
- #if defined(MBEDTLS_SSL_SESSION_TICKETS)
-     ssl_write_session_ticket_ext( ssl, p + 2 + ext_len, &olen );
-     ext_len += olen;
-@@ -1308,6 +1386,81 @@ static int ssl_parse_alpn_ext( mbedtls_ssl_context *ssl,
- }
- #endif /* MBEDTLS_SSL_ALPN */
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+static int ssl_parse_use_srtp_ext( mbedtls_ssl_context *ssl,
-+                               const unsigned char *buf, size_t len )
-+{
-+    enum mbedtls_DTLS_SRTP_protection_profiles server_protection = MBEDTLS_SRTP_UNSET_PROFILE;
-+    size_t i;
-+    uint16_t server_protection_profile_value = 0;
-+
-+    /* If use_srtp is not configured, just ignore the extension */
-+    if( ( ssl->conf->dtls_srtp_profiles_list == NULL ) || ( ssl->conf->dtls_srtp_profiles_list_len == 0 ) )
-+        return( 0 );
-+
-+    /* RFC5764 section 4.1.1
-+     * uint8 SRTPProtectionProfile[2];
-+     *
-+     * struct {
-+     *   SRTPProtectionProfiles SRTPProtectionProfiles;
-+     *   opaque srtp_mki<0..255>;
-+     * } UseSRTPData;
-+
-+     * SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1>;
-+     *
-+     * Note: srtp_mki is not supported
-+     */
-+
-+    /* Length is 5 : one protection profile(2 bytes) + length(2 bytes) and potential srtp_mki which won't be parsed */
-+    if( len < 5 )
-+        return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
-+
-+    /*
-+     * get the server protection profile
-+     */
-+    if (((uint16_t)(buf[0]<<8 | buf[1])) != 0x0002) { /* protection profile length must be 0x0002 as we must have only one protection profile in server Hello */
-+        return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
-+    } else {
-+        server_protection_profile_value = buf[2]<<8 | buf[3];
-+    }
-+
-+    /*
-+     * Check we have the server profile in our list
-+     */
-+    for( i=0; i < ssl->conf->dtls_srtp_profiles_list_len; i++)
-+    {
-+        switch ( server_protection_profile_value ) {
-+            case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE:
-+                server_protection = MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80;
-+                break;
-+            case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE:
-+                server_protection = MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32;
-+                break;
-+            case MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE:
-+                server_protection = MBEDTLS_SRTP_NULL_HMAC_SHA1_80;
-+                break;
-+            case MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE:
-+                server_protection = MBEDTLS_SRTP_NULL_HMAC_SHA1_32;
-+                break;
-+            default:
-+                server_protection = MBEDTLS_SRTP_UNSET_PROFILE;
-+                break;
-+        }
-+
-+        if (server_protection == ssl->conf->dtls_srtp_profiles_list[i]) {
-+            ssl->chosen_dtls_srtp_profile = ssl->conf->dtls_srtp_profiles_list[i];
-+            return 0;
-+        }
-+    }
-+
-+    /* If we get there, no match was found : server problem, it shall never answer with incompatible profile */
-+    ssl->chosen_dtls_srtp_profile = MBEDTLS_SRTP_UNSET_PROFILE;
-+    mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
-+                            MBEDTLS_SSL_ALERT_MSG_HANDSHAKE_FAILURE );
-+    return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
-+}
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- /*
-  * Parse HelloVerifyRequest.  Only called after verifying the HS type.
-  */
-@@ -1786,6 +1939,16 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl )
-             break;
- #endif /* MBEDTLS_SSL_ALPN */
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+        case MBEDTLS_TLS_EXT_USE_SRTP:
-+            MBEDTLS_SSL_DEBUG_MSG( 3, ( "found use_srtp extension" ) );
-+
-+            if( ( ret = ssl_parse_use_srtp_ext( ssl, ext + 4, ext_size ) ) != 0 )
-+                return( ret );
-+
-+            break;
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
-         default:
-             MBEDTLS_SSL_DEBUG_MSG( 3, ( "unknown extension found: %d (ignoring)",
-                            ext_id ) );
-diff --git a/library/ssl_srv.c b/library/ssl_srv.c
-index 6b5b461..72b50ab 100644
---- library/ssl_srv.c
-+++ library/ssl_srv.c
-@@ -573,6 +573,78 @@ static int ssl_parse_alpn_ext( mbedtls_ssl_context *ssl,
- }
- #endif /* MBEDTLS_SSL_ALPN */
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+static int ssl_parse_use_srtp_ext( mbedtls_ssl_context *ssl,
-+                               const unsigned char *buf, size_t len )
-+{
-+    enum mbedtls_DTLS_SRTP_protection_profiles client_protection = MBEDTLS_SRTP_UNSET_PROFILE;
-+    size_t i,j;
-+    uint16_t profile_length;
-+
-+    /* If use_srtp is not configured, just ignore the extension */
-+    if( ( ssl->conf->dtls_srtp_profiles_list == NULL ) || ( ssl->conf->dtls_srtp_profiles_list_len == 0 ) )
-+        return( 0 );
-+
-+    /* RFC5764 section 4.1.1
-+     * uint8 SRTPProtectionProfile[2];
-+     *
-+     * struct {
-+     *   SRTPProtectionProfiles SRTPProtectionProfiles;
-+     *   opaque srtp_mki<0..255>;
-+     * } UseSRTPData;
-+
-+     * SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1>;
-+     *
-+     * Note: srtp_mki is not supported
-+     */
-+
-+    /* Min length is 5 : at least one protection profile(2 bytes) and length(2 bytes) + srtp_mki length(1 byte) */
-+    if( len < 5 )
-+        return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO );
-+
-+    /*
-+     * Use our order of preference
-+     */
-+    profile_length = buf[0]<<8|buf[1]; /* first 2 bytes are protection profile length(in bytes) */
-+    for( i=0; i < ssl->conf->dtls_srtp_profiles_list_len; i++)
-+    {
-+        /* parse the extension list values are defined in http://www.iana.org/assignments/srtp-protection/srtp-protection.xhtml */
-+        for (j=0; j<profile_length; j+=2) { /* parse only the protection profile, srtp_mki is not supported and ignored */
-+            uint16_t protection_profile_value = buf[j+2]<<8 | buf[j+3]; /* +2 to skip the length field */
-+
-+            switch ( protection_profile_value ) {
-+                case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE:
-+                    client_protection = MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80;
-+                    break;
-+                case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE:
-+                    client_protection = MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32;
-+                    break;
-+                case MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE:
-+                    client_protection = MBEDTLS_SRTP_NULL_HMAC_SHA1_80;
-+                    break;
-+                case MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE:
-+                    client_protection = MBEDTLS_SRTP_NULL_HMAC_SHA1_32;
-+                    break;
-+                default:
-+                    client_protection = MBEDTLS_SRTP_UNSET_PROFILE;
-+                    break;
-+            }
-+
-+            if (client_protection == ssl->conf->dtls_srtp_profiles_list[i]) {
-+                ssl->chosen_dtls_srtp_profile = ssl->conf->dtls_srtp_profiles_list[i];
-+                return 0;
-+            }
-+        }
-+    }
-+
-+    /* If we get there, no match was found */
-+    ssl->chosen_dtls_srtp_profile = MBEDTLS_SRTP_UNSET_PROFILE;
-+    mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL,
-+                            MBEDTLS_SSL_ALERT_MSG_HANDSHAKE_FAILURE );
-+    return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO );
-+}
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- /*
-  * Auxiliary functions for ServerHello parsing and related actions
-  */
-@@ -1675,7 +1747,16 @@ read_record_header:
-                 if( ret != 0 )
-                     return( ret );
-                 break;
--#endif /* MBEDTLS_SSL_SESSION_TICKETS */
-+#endif /* MBEDTLS_SSL_ALPN */
-+
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+            case MBEDTLS_TLS_EXT_USE_SRTP:
-+                MBEDTLS_SSL_DEBUG_MSG( 3, ( "found use_srtp extension" ) );
-+                ret = ssl_parse_use_srtp_ext( ssl, ext + 4, ext_size );
-+                if ( ret != 0)
-+                    return( ret );
-+                break;
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
- 
-             default:
-                 MBEDTLS_SSL_DEBUG_MSG( 3, ( "unknown extension found: %d (ignoring)",
-@@ -2144,6 +2225,57 @@ static void ssl_write_alpn_ext( mbedtls_ssl_context *ssl,
- }
- #endif /* MBEDTLS_ECDH_C || MBEDTLS_ECDSA_C */
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP )
-+static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl,
-+                                unsigned char *buf, size_t *olen )
-+{
-+    if( ssl->chosen_dtls_srtp_profile == MBEDTLS_SRTP_UNSET_PROFILE )
-+    {
-+        *olen = 0;
-+        return;
-+    }
-+
-+    MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding use_srtp extension" ) );
-+
-+    /* extension */
-+    buf[0] = (unsigned char)( ( MBEDTLS_TLS_EXT_USE_SRTP >> 8 ) & 0xFF );
-+    buf[1] = (unsigned char)( ( MBEDTLS_TLS_EXT_USE_SRTP      ) & 0xFF );
-+    /* total length (5: only one profile(2 bytes) and length(2bytes) and srtp_mki not supported so zero length(1byte) ) */
-+    buf[2] = 0x00;
-+    buf[3] = 0x05;
-+
-+    /* protection profile length: 2 */
-+    buf[4] = 0x00;
-+    buf[5] = 0x02;
-+    switch (ssl->chosen_dtls_srtp_profile) {
-+        case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80:
-+            buf[6] = (unsigned char)( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE >> 8) & 0xFF );
-+            buf[7] = (unsigned char)( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80_IANA_VALUE     ) & 0xFF );
-+            break;
-+        case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32:
-+            buf[6] = (unsigned char)( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE >> 8) & 0xFF );
-+            buf[7] = (unsigned char)( ( MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32_IANA_VALUE     ) & 0xFF );
-+            break;
-+        case MBEDTLS_SRTP_NULL_HMAC_SHA1_80:
-+            buf[6] = (unsigned char)( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE >> 8) & 0xFF );
-+            buf[7] = (unsigned char)( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_80_IANA_VALUE     ) & 0xFF );
-+            break;
-+        case MBEDTLS_SRTP_NULL_HMAC_SHA1_32:
-+            buf[6] = (unsigned char)( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE >> 8) & 0xFF );
-+            buf[7] = (unsigned char)( ( MBEDTLS_SRTP_NULL_HMAC_SHA1_32_IANA_VALUE     ) & 0xFF );
-+            break;
-+        default:
-+            *olen = 0;
-+            return;
-+            break;
-+    }
-+
-+    buf[8] = 0x00; /* unsupported srtp_mki variable length vector set to 0 */
-+
-+    *olen = 9;
-+}
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- #if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
- static int ssl_write_hello_verify_request( mbedtls_ssl_context *ssl )
- {
-@@ -2408,6 +2540,11 @@ static int ssl_write_server_hello( mbedtls_ssl_context *ssl )
-     ext_len += olen;
- #endif
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+    ssl_write_use_srtp_ext( ssl, p + 2 + ext_len, &olen);
-+    ext_len += olen;
-+#endif
-+
-     MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, total extension length: %d", ext_len ) );
- 
-     if( ext_len > 0 )
-diff --git a/library/ssl_tls.c b/library/ssl_tls.c
-index 4424f56..940f8aa 100644
---- library/ssl_tls.c
-+++ library/ssl_tls.c
-@@ -373,7 +373,7 @@ static int tls_prf_generic( mbedtls_md_type_t md_type,
- {
-     size_t nb;
-     size_t i, j, k, md_len;
--    unsigned char tmp[128];
-+    unsigned char tmp[144];
-     unsigned char h_i[MBEDTLS_MD_MAX_SIZE];
-     const mbedtls_md_info_t *md_info;
-     mbedtls_md_context_t md_ctx;
-@@ -636,6 +636,30 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
-     else
-         MBEDTLS_SSL_DEBUG_MSG( 3, ( "no premaster (session resumed)" ) );
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+    /* check if we have a chosen srtp protection profile */
-+    if (ssl->chosen_dtls_srtp_profile != MBEDTLS_SRTP_UNSET_PROFILE) {
-+        /* derive key material for srtp session RFC5764 section 4.2 */
-+        /* master key and master salt are respectively 128 bits and 112 bits for all currently available modes :
-+         * SRTP_AES128_CM_HMAC_SHA1_80, SRTP_AES128_CM_HMAC_SHA1_32
-+         * SRTP_NULL_HMAC_SHA1_80, SRTP_NULL_HMAC_SHA1_32
-+         * So we must export 2*(128 + 112) = 480 bits
-+         */
-+        ssl->dtls_srtp_keys_len = 60;
-+
-+        ssl->dtls_srtp_keys = (unsigned char *)mbedtls_calloc(1, ssl->dtls_srtp_keys_len);
-+
-+        ret = handshake->tls_prf( session->master, 48, "EXTRACTOR-dtls_srtp",
-+                        handshake->randbytes, 64, ssl->dtls_srtp_keys, ssl->dtls_srtp_keys_len );
-+
-+        if( ret != 0 )
-+        {
-+            MBEDTLS_SSL_DEBUG_RET( 1, "dtls srtp prf", ret );
-+            return( ret );
-+        }
-+    }
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
-     /*
-      * Swap the client and server random values.
-      */
-@@ -5408,6 +5432,12 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
-         ssl->in_msg = ssl->in_buf + 13;
-     }
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+    ssl->chosen_dtls_srtp_profile = MBEDTLS_SRTP_UNSET_PROFILE;
-+    ssl->dtls_srtp_keys = NULL;
-+    ssl->dtls_srtp_keys_len = 0;
-+#endif
-+
-     if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
-         return( ret );
- 
-@@ -5997,6 +6027,61 @@ const char *mbedtls_ssl_get_alpn_protocol( const mbedtls_ssl_context *ssl )
- }
- #endif /* MBEDTLS_SSL_ALPN */
- 
-+#if defined(MBEDTLS_SSL_DTLS_SRTP)
-+int mbedtls_ssl_conf_dtls_srtp_protection_profiles( mbedtls_ssl_config *conf, const enum mbedtls_DTLS_SRTP_protection_profiles *profiles, size_t profiles_number)
-+{
-+    size_t i;
-+    /* check in put validity : must be a list of profiles from enumeration */
-+    /* maximum length is 4 as only 4 protection profiles are defined */
-+    if (profiles_number>4) {
-+            return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
-+    }
-+
-+    mbedtls_free(conf->dtls_srtp_profiles_list);
-+    conf->dtls_srtp_profiles_list = (enum mbedtls_DTLS_SRTP_protection_profiles *)mbedtls_calloc(1, profiles_number*sizeof(enum mbedtls_DTLS_SRTP_protection_profiles));
-+
-+    for (i=0; i<profiles_number; i++) {
-+        switch (profiles[i]) {
-+            case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80:
-+            case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32:
-+            case MBEDTLS_SRTP_NULL_HMAC_SHA1_80:
-+            case MBEDTLS_SRTP_NULL_HMAC_SHA1_32:
-+                conf->dtls_srtp_profiles_list[i] = profiles[i];
-+                break;
-+            default:
-+                mbedtls_free(conf->dtls_srtp_profiles_list);
-+                conf->dtls_srtp_profiles_list = NULL;
-+                conf->dtls_srtp_profiles_list_len = 0;
-+                return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
-+        }
-+    }
-+
-+    /* assign array length */
-+    conf->dtls_srtp_profiles_list_len = profiles_number;
-+
-+    return( 0 );
-+}
-+
-+enum mbedtls_DTLS_SRTP_protection_profiles mbedtls_ssl_get_dtls_srtp_protection_profile( const mbedtls_ssl_context *ssl)
-+{
-+    return( ssl->chosen_dtls_srtp_profile);
-+}
-+
-+int mbedtls_ssl_get_dtls_srtp_key_material( const mbedtls_ssl_context *ssl, unsigned char *key, const size_t key_buffer_len, size_t *key_len ) {
-+    *key_len = 0;
-+
-+    /* check output buffer size */
-+    if ( key_buffer_len < ssl->dtls_srtp_keys_len) {
-+        return MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL;
-+    }
-+
-+    memcpy( key, ssl->dtls_srtp_keys, ssl->dtls_srtp_keys_len);
-+    *key_len = ssl->dtls_srtp_keys_len;
-+
-+    return 0;
-+}
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
- void mbedtls_ssl_conf_max_version( mbedtls_ssl_config *conf, int major, int minor )
- {
-     conf->max_major_ver = major;
-@@ -7083,6 +7169,11 @@ void mbedtls_ssl_free( mbedtls_ssl_context *ssl )
-     mbedtls_free( ssl->cli_id );
- #endif
- 
-+#if defined (MBEDTLS_SSL_DTLS_SRTP)
-+    mbedtls_platform_zeroize( ssl->dtls_srtp_keys, ssl->dtls_srtp_keys_len );
-+    mbedtls_free( ssl->dtls_srtp_keys );
-+#endif /* MBEDTLS_SSL_DTLS_SRTP */
-+
-     MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= free" ) );
- 
-     /* Actually clear after last debug message */
-@@ -7311,6 +7402,10 @@ void mbedtls_ssl_config_free( mbedtls_ssl_config *conf )
-     ssl_key_cert_free( conf->key_cert );
- #endif
- 
-+#if defined (MBEDTLS_SSL_DTLS_SRTP)
-+    mbedtls_free( conf->dtls_srtp_profiles_list );
-+#endif
-+
-     mbedtls_platform_zeroize( conf, sizeof( mbedtls_ssl_config ) );
- }
- 
diff --git a/security/mbedtls/files/patch-include_mbedtls_config.h b/security/mbedtls/files/patch-include_mbedtls_config.h
new file mode 100644
index 000000000000..fa23d72d7946
--- /dev/null
+++ b/security/mbedtls/files/patch-include_mbedtls_config.h
@@ -0,0 +1,29 @@
+--- include/mbedtls/config.h.orig	2021-12-15 13:47:54 UTC
++++ include/mbedtls/config.h
+@@ -1946,7 +1946,7 @@
+  *
+  * Uncomment this to enable support for use_srtp extension.
+  */
+-//#define MBEDTLS_SSL_DTLS_SRTP
++#define MBEDTLS_SSL_DTLS_SRTP
+ 
+ /**
+  * \def MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
+@@ -2129,7 +2129,7 @@
+  *
+  * Uncomment this to enable pthread mutexes.
+  */
+-//#define MBEDTLS_THREADING_PTHREAD
++#define MBEDTLS_THREADING_PTHREAD
+ 
+ /**
+  * \def MBEDTLS_USE_PSA_CRYPTO
+@@ -3452,7 +3452,7 @@
+  *
+  * Enable this layer to allow use of mutexes within mbed TLS
+  */
+-//#define MBEDTLS_THREADING_C
++#define MBEDTLS_THREADING_C
+ 
+ /**
+  * \def MBEDTLS_TIMING_C
diff --git a/security/mbedtls/pkg-descr b/security/mbedtls/pkg-descr
index 8901bb50743e..41b01c0c3c83 100644
--- a/security/mbedtls/pkg-descr
+++ b/security/mbedtls/pkg-descr
@@ -1,4 +1,4 @@
 mbed TLS is a lightweight, portable, fully featured and standards compliant
 SSL/TLS and cryptography library.
 
-WWW: https://tls.mbed.org/
+WWW: https://www.trustedfirmware.org/projects/mbed-tls/
diff --git a/security/mbedtls/pkg-plist b/security/mbedtls/pkg-plist
index fd4aa001cfa7..f98edaf834e3 100644
--- a/security/mbedtls/pkg-plist
+++ b/security/mbedtls/pkg-plist
@@ -4,21 +4,36 @@ bin/mbedtls_cert_req
 bin/mbedtls_cert_write
 bin/mbedtls_crl_app
 bin/mbedtls_crypt_and_hash
+bin/mbedtls_crypto_examples
 bin/mbedtls_dh_client
 bin/mbedtls_dh_genprime
 bin/mbedtls_dh_server
+bin/mbedtls_dlopen
+bin/mbedtls_dlopen_demo.sh
 bin/mbedtls_dtls_client
 bin/mbedtls_dtls_server
 bin/mbedtls_ecdh_curve25519
 bin/mbedtls_ecdsa
+bin/mbedtls_fuzz_client
+bin/mbedtls_fuzz_dtlsclient
+bin/mbedtls_fuzz_dtlsserver
+bin/mbedtls_fuzz_privkey
+bin/mbedtls_fuzz_pubkey
+bin/mbedtls_fuzz_server
+bin/mbedtls_fuzz_x509crl
+bin/mbedtls_fuzz_x509crt
+bin/mbedtls_fuzz_x509csr
 bin/mbedtls_gen_entropy
 bin/mbedtls_gen_key
 bin/mbedtls_gen_random_ctr_drbg
 bin/mbedtls_gen_random_havege
+bin/mbedtls_generate_cpp_dummy_build.sh
 bin/mbedtls_generic_sum
 bin/mbedtls_hello
 bin/mbedtls_key_app
 bin/mbedtls_key_app_writer
+bin/mbedtls_key_ladder_demo
+bin/mbedtls_key_ladder_demo.sh
 bin/mbedtls_load_roots
 bin/mbedtls_mini_client
 bin/mbedtls_mpi_demo
@@ -27,6 +42,7 @@ bin/mbedtls_pk_decrypt
 bin/mbedtls_pk_encrypt
 bin/mbedtls_pk_sign
 bin/mbedtls_pk_verify
+bin/mbedtls_psa_constant_names
 bin/mbedtls_query_compile_time_config
 bin/mbedtls_req_app
 bin/mbedtls_rsa_decrypt
@@ -39,6 +55,7 @@ bin/mbedtls_rsa_verify_pss
 bin/mbedtls_selftest
 bin/mbedtls_ssl_client1
 bin/mbedtls_ssl_client2
+bin/mbedtls_ssl_context_info
 bin/mbedtls_ssl_fork_server
 bin/mbedtls_ssl_mail_client
 bin/mbedtls_ssl_server
@@ -68,6 +85,8 @@ include/mbedtls/cipher_internal.h
 include/mbedtls/cmac.h
 include/mbedtls/compat-1.3.h
 include/mbedtls/config.h
+include/mbedtls/config_psa.h
+include/mbedtls/constant_time.h
 include/mbedtls/ctr_drbg.h
 include/mbedtls/debug.h
 include/mbedtls/des.h
@@ -105,6 +124,7 @@ include/mbedtls/platform.h
 include/mbedtls/platform_time.h
 include/mbedtls/platform_util.h
 include/mbedtls/poly1305.h
+include/mbedtls/psa_util.h
 include/mbedtls/ripemd160.h
 include/mbedtls/rsa.h
 include/mbedtls/rsa_internal.h
@@ -125,12 +145,27 @@ include/mbedtls/x509_crl.h
 include/mbedtls/x509_crt.h
 include/mbedtls/x509_csr.h
 include/mbedtls/xtea.h
+include/psa/crypto.h
+include/psa/crypto_builtin_composites.h
+include/psa/crypto_builtin_primitives.h
+include/psa/crypto_compat.h
+include/psa/crypto_config.h
+include/psa/crypto_driver_common.h
+include/psa/crypto_driver_contexts_composites.h
+include/psa/crypto_driver_contexts_primitives.h
+include/psa/crypto_extra.h
+include/psa/crypto_platform.h
+include/psa/crypto_se_driver.h
+include/psa/crypto_sizes.h
+include/psa/crypto_struct.h
+include/psa/crypto_types.h
+include/psa/crypto_values.h
 lib/libmbedcrypto.a
 lib/libmbedcrypto.so
-lib/libmbedcrypto.so.3
+lib/libmbedcrypto.so.7
 lib/libmbedtls.a
 lib/libmbedtls.so
-lib/libmbedtls.so.12
+lib/libmbedtls.so.14
 lib/libmbedx509.a
 lib/libmbedx509.so
-lib/libmbedx509.so.0
+lib/libmbedx509.so.1
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index a118648f9e33..3aaccdd308e0 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openvpn
 DISTVERSION=	g20210603
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security net net-vpn
 PKGNAMESUFFIX=	-devel
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index c2a7d0ea7321..57675596700a 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		openvpn
 DISTVERSION=		2.5.5
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
 			https://build.openvpn.net/downloads/releases/ \
diff --git a/security/uacme/Makefile b/security/uacme/Makefile
index 0958aa6df956..a37044335de0 100644
--- a/security/uacme/Makefile
+++ b/security/uacme/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	uacme
 DISTVERSIONPREFIX=	upstream/
 DISTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	security www
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 82bca118cf97..4b006272f1ba 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hiawatha
 PORTVERSION=	10.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 7396825a3dd1..8c2f58b1a120 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME?=	lighttpd
 PORTVERSION=	1.4.64
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES?=	https://download.lighttpd.net/lighttpd/releases-1.4.x/