diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile
index f81b9a95e4ae..1aec30d6868c 100644
--- a/security/openssl-quictls/Makefile
+++ b/security/openssl-quictls/Makefile
@@ -1,183 +1,181 @@
 PORTNAME=	openssl
 DISTVERSIONPREFIX=	${PORTNAME}-
 PORTVERSION=	3.0.15
 PORTREVISION=	1
 DISTVERSIONSUFFIX=	-quic1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	-${GH_ACCOUNT}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	QUIC capable fork of OpenSSL
 WWW=		https://www.github.com/quictls/openssl
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3* openssl31-quictls
 
 BROKEN_i386=	ld: error: undefined symbol: __atomic_is_lock_free
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_ACCOUNT=	quictls
 
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 EXTRA_PATCHES+=	${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h
 
 OPTIONS_GROUP=		CIPHERS HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED ZLIB
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST KTLS MAN3 MD4 NEXTPROTONEG \
 		RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2
 
-OPTIONS_EXCLUDE= CRYPTODEV
 OPTIONS_EXCLUDE_i386=	FIPS
 
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider (Note: NOT yet FIPS validated)
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 sse2 \
 	threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON+=	enable-ssl3-method
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${DISTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|^SHLIB_VERSION=.*$$|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-${OPENSSL_SHLIBVER}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; find share/man/man3 -not -type d ; \
 		find share/man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl-quictls/pkg-plist b/security/openssl-quictls/pkg-plist
index fcb67b5e57f8..8258642b4355 100644
--- a/security/openssl-quictls/pkg-plist
+++ b/security/openssl-quictls/pkg-plist
@@ -1,276 +1,276 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/quic.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index daf95407a8ab..c9e7409e08f6 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,186 +1,183 @@
 PORTNAME=	openssl
 PORTVERSION=	3.0.15
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security devel
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 WWW=		https://www.openssl.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 #EXPIRATION_DATE=	2026-09-07
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl111 openssl3* openssl*-quictls
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 TEST_TARGET=	test
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 OPTIONS_GROUP=		CIPHERS HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED ZLIB
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST KTLS MAN3 MD4 NEXTPROTONEG \
 		RFC3779 RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2
 
-OPTIONS_EXCLUDE=CRYPTODEV
-
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 sse2 \
 	threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 KTLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ktls
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON+=	enable-ssl3-method
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${PORTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	BSD-ppc64
 .elif ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	BSD-ppc64le
 .elif ${ARCH} == riscv64
 CONFIGURE_ARGS+=	BSD-riscv64
 .endif
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-12
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; ${FIND} share/man/man3 -not -type d ; \
 		${FIND} share/man/man7 -not -type d ) | ${SED} 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 67e718e5f7d3..37d4816c9993 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -1,275 +1,275 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs
diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile
index c64c4aab068a..b88948d4dcc3 100644
--- a/security/openssl111/Makefile
+++ b/security/openssl111/Makefile
@@ -1,166 +1,163 @@
 PORTNAME=	openssl
 PORTVERSION=	1.1.1w
 PORTREVISION=	2
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
 PKGNAMESUFFIX=	111
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 WWW=		https://www.openssl.org/
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	End-of-life since 2023-09-11, see https://www.openssl.org/blog/blog/2023/09/11/eol-111/ \
 		port will be removed when FreeBSD 13 is EoL
 EXPIRATION_DATE=	2026-04-30
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl3[12] openssl-quictls
 
 USES=		cpe perl5
 USE_PERL5=	build
 TEST_TARGET=	test
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 EXTRA_PATCHES+=	${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h
 
 OPTIONS_GROUP=		CIPHERS HASHES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED ZLIB
 
 OPTIONS_DEFAULT=ASM ASYNC CT GOST DES EC KTLS MAN3 MD4 NEXTPROTONEG RC2 \
 		RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2
 
-OPTIONS_EXCLUDE=CRYPTODEV
-
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Kernel TLS offload
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in ktls md2 rc5 sctp ssl3 zlib weak-ssl-ciphers
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg rc2 rc4 \
 	rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 I386_CONFIGURE_ON=	386
 KTLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ktls
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_process__docs.pl
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SSL3_CONFIGURE_ON+=	enable-ssl3-method
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 
 PORTSCOUT=		limit:^1\.1\.1
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's| install_html_docs$$||' \
 		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} -e 's|\^GNU ld|GNU|' ${WRKSRC}/Configurations/shared-info.pl
 
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|SHLIB_VERSION_NUMBER=1.1|SHLIB_VERSION_NUMBER=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} \
 		-e 's|SHLIB_VERSION_NUMBER "1.1"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \
 		${WRKSRC}/include/openssl/opensslv.h
 
 post-install-SHARED-on:
 .for i in libcrypto libssl
 	${INSTALL_LIB} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so
 .endfor
 .for i in capi padlock
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines-1.1/${i}.so
 .endfor
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; ${FIND} share/man/man3 share/man/man7 -not -type d ) | \
 		${SED} 's/$$/.gz/' >>${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile
index 0315d6057f47..627e6a3b3990 100644
--- a/security/openssl31-quictls/Makefile
+++ b/security/openssl31-quictls/Makefile
@@ -1,195 +1,192 @@
 PORTNAME=	openssl
 DISTVERSIONPREFIX=	${PORTNAME}-
 PORTVERSION=	3.1.7
 PORTREVISION=	1
 DISTVERSIONSUFFIX=	-quic1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	31-quictls
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	QUIC capable fork of OpenSSL
 WWW=		https://www.github.com/quictls/openssl
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3* openssl-quictls
 
 BROKEN_i386=	ld: error: undefined symbol: __atomic_is_lock_free
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PKGNAMESUFFIX:C/.*-//}
 
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 EXTRA_PATCHES+=	${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h
 
 OPTIONS_GROUP=		CIPHERS HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED ZLIB
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST KTLS MAN3 MD4 NEXTPROTONEG \
 		RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2
 
-OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:} \
-		${${OSVERSION} > 1300000:?CRYPTODEV:}
 OPTIONS_EXCLUDE_i386=	FIPS
 
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider (Note: NOT yet FIPS validated)
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 sse2 \
 	threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON+=	enable-ssl3-method
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${DISTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	BSD-ppc64
 .elif ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	BSD-ppc64le
 .elif ${ARCH} == riscv64
 CONFIGURE_ARGS+=	BSD-riscv64
 .endif
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/share/man|' \
 		-e 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=81.3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-${OPENSSL_SHLIBVER}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; find share/man/man3 -not -type d ; \
 		find share/man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl31-quictls/pkg-plist b/security/openssl31-quictls/pkg-plist
index fcb67b5e57f8..8258642b4355 100644
--- a/security/openssl31-quictls/pkg-plist
+++ b/security/openssl31-quictls/pkg-plist
@@ -1,276 +1,276 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/quic.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs
diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile
index 0c27060eafb4..6bb8972f57dc 100644
--- a/security/openssl31/Makefile
+++ b/security/openssl31/Makefile
@@ -1,190 +1,187 @@
 PORTNAME=	openssl
 PORTVERSION=	3.1.7
 PORTREVISION=	1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	31
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 WWW=		https://www.openssl.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 #EXPIRATION_DATE=	2025-03-14
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3[234] openssl*-quictls
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 EXTRA_PATCHES+=	${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h
 
 OPTIONS_GROUP=		CIPHERS HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED ZLIB
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST KTLS MAN3 MD4 NEXTPROTONEG \
 		RFC3779	RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2
 
-OPTIONS_EXCLUDE=CRYPTODEV
-
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 sse2 \
 	threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 KTLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ktls
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON+=	enable-ssl3-method
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${DISTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	BSD-ppc64
 .elif ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	BSD-ppc64le
 .elif ${ARCH} == riscv64
 CONFIGURE_ARGS+=	BSD-riscv64
 .endif
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-12
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; find share/man/man3 -not -type d ; \
 		find share/man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl31/pkg-plist b/security/openssl31/pkg-plist
index 67e718e5f7d3..37d4816c9993 100644
--- a/security/openssl31/pkg-plist
+++ b/security/openssl31/pkg-plist
@@ -1,275 +1,275 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs
diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile
index bf39bd99a472..704a1ec82142 100644
--- a/security/openssl32/Makefile
+++ b/security/openssl32/Makefile
@@ -1,202 +1,199 @@
 PORTNAME=	openssl
 PORTVERSION=	3.2.3
 PORTREVISION=	1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	32
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 WWW=		https://www.openssl.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3[134] openssl*-quictls
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 EXTRA_PATCHES+=	${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h
 
 OPTIONS_GROUP=		CIPHERS COMPRESSION HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_COMPRESSION=	BROTLI ZLIB ZSTD
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS THREADPOOL
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG QUIC SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST MAN3 MD4 NEXTPROTONEG \
 		QUIC RFC3779 RC2 RC4 RMD160 SCTP SHARED SSE2 \
 		THREADPOOL THREADS TLS1 TLS1_1 TLS1_2
 #OPTIONS_DEFAULT+=	KTLS pending updated KTLS patch
 
-OPTIONS_EXCLUDE=CRYPTODEV
-
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
 COMPRESSION_DESC=	Compression Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider (Note: NOT yet FIPS validated)
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 QUIC_DESC=	HTTP/3
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 THREADPOOL_DESC=Thread Pooling support
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in brotli fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib zstd
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg quic rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 \
 	sse2 threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 BROTLI_CFLAGS=		-I${PREFIX}/include
 BROTLI_CONFIGURE_ON=	enable-brotli-dynamic
 BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 KTLS_BROKEN=		Pending updated KTLS patch
 KTLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ktls
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON=	enable-ssl3-method
 THREADPOOL_CONFIGURE_OFF=	no-thread-pool
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 ZSTD_CFLAGS=		-I${PREFIX}/include
 ZSTD_CONFIGURE_ON=	enable-zstd-dynamic
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${DISTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	BSD-ppc64
 .elif ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	BSD-ppc64le
 .elif ${ARCH} == riscv64
 CONFIGURE_ARGS+=	BSD-riscv64
 .endif
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-12
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; find share/man/man3 -not -type d ; \
 		find share/man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl32/pkg-plist b/security/openssl32/pkg-plist
index 1f131b2286e0..322870827bf5 100644
--- a/security/openssl32/pkg-plist
+++ b/security/openssl32/pkg-plist
@@ -1,279 +1,279 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/e_ostime.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/hpke.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/quic.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/thread.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs
diff --git a/security/openssl33/Makefile b/security/openssl33/Makefile
index 8253e72508b1..d0f5da476ba8 100644
--- a/security/openssl33/Makefile
+++ b/security/openssl33/Makefile
@@ -1,202 +1,199 @@
 PORTNAME=	openssl
 PORTVERSION=	3.3.2
 PORTREVISION=	1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	33
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 WWW=		https://www.openssl.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3[124] openssl*-quictls
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 EXTRA_PATCHES+=	${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h
 
 OPTIONS_GROUP=		CIPHERS COMPRESSION HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_COMPRESSION=	BROTLI ZLIB ZSTD
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS THREADPOOL
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG QUIC SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST MAN3 MD4 NEXTPROTONEG \
 		QUIC RFC3779 RC2 RC4 RMD160 SCTP SHARED SSE2 \
 		THREADPOOL THREADS TLS1 TLS1_1 TLS1_2
 #OPTIONS_DEFAULT+=	KTLS pending updated KTLS patch
 
-OPTIONS_EXCLUDE=CRYPTODEV
-
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
 COMPRESSION_DESC=	Compression Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider (Note: NOT yet FIPS validated)
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 QUIC_DESC=	HTTP/3
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 THREADPOOL_DESC=Thread Pooling support
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in brotli fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib zstd
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg quic rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 \
 	sse2 threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 BROTLI_CFLAGS=		-I${PREFIX}/include
 BROTLI_CONFIGURE_ON=	enable-brotli-dynamic
 BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 KTLS_BROKEN=		Pending updated KTLS patch
 KTLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ktls
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON=	enable-ssl3-method
 THREADPOOL_CONFIGURE_OFF=	no-thread-pool
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 ZSTD_CFLAGS=		-I${PREFIX}/include
 ZSTD_CONFIGURE_ON=	enable-zstd-dynamic
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${DISTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	BSD-ppc64
 .elif ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	BSD-ppc64le
 .elif ${ARCH} == riscv64
 CONFIGURE_ARGS+=	BSD-riscv64
 .endif
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-12
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; find share/man/man3 -not -type d ; \
 		find share/man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl33/pkg-plist b/security/openssl33/pkg-plist
index fbbd426207f8..7deea2f22eea 100644
--- a/security/openssl33/pkg-plist
+++ b/security/openssl33/pkg-plist
@@ -1,281 +1,281 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/e_ostime.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/hpke.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/quic.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/thread.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 lib/cmake/OpenSSL/OpenSSLConfig.cmake
 lib/cmake/OpenSSL/OpenSSLConfigVersion.cmake
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs
diff --git a/security/openssl34/Makefile b/security/openssl34/Makefile
index e959d49ccdb9..b4819f02f87d 100644
--- a/security/openssl34/Makefile
+++ b/security/openssl34/Makefile
@@ -1,199 +1,196 @@
 PORTNAME=	openssl
 DISTVERSION=	3.4.0
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	34
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
 WWW=		https://www.openssl.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3[123] openssl*-quictls
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
 
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 
 OPTIONS_GROUP=		CIPHERS COMPRESSION HASHES MODULES OPTIMIZE PROTOCOLS
 OPTIONS_GROUP_CIPHERS=	ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
 OPTIONS_GROUP_COMPRESSION=	BROTLI ZLIB ZSTD
 OPTIONS_GROUP_HASHES=	MD2 MD4 MDC2 RMD160 SM2 SM3
 OPTIONS_GROUP_OPTIMIZE=	ASM SSE2 THREADS THREADPOOL
 OPTIONS_GROUP_MODULES=	FIPS LEGACY
 OPTIONS_DEFINE_i386=	I386
 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG QUIC SCTP SSL3 TLS1 TLS1_1 TLS1_2
 
-OPTIONS_DEFINE=	ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED
+OPTIONS_DEFINE=	ASYNC CT KTLS MAN3 RFC3779 SHARED
 
 OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST MAN3 MD4 NEXTPROTONEG \
 		QUIC RFC3779 RC2 RC4 RMD160 SCTP SHARED SSE2 \
 		THREADPOOL THREADS TLS1 TLS1_1 TLS1_2
 #OPTIONS_DEFAULT+=	KTLS pending updated KTLS patch
 
-OPTIONS_EXCLUDE=CRYPTODEV
-
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
 .if ${MACHINE_ARCH} == "amd64"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .elif ${MACHINE_ARCH} == "mips64el"
 OPTIONS_GROUP_OPTIMIZE+=	EC
 .endif
 
 OPTIONS_SUB=	yes
 
 ARIA_DESC=	ARIA (South Korean standard)
 ASM_DESC=	Assembler code
 ASYNC_DESC=	Asynchronous mode
 CIPHERS_DESC=	Block Cipher Support
 COMPRESSION_DESC=	Compression Support
-CRYPTODEV_DESC=	/dev/crypto support
 CT_DESC=	Certificate Transparency Support
 DES_DESC=	(Triple) Data Encryption Standard
 EC_DESC=	Optimize NIST elliptic curves
 FIPS_DESC=	Build FIPS provider (Note: NOT yet FIPS validated)
 GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
 KTLS_DESC=	Use in-kernel TLS (FreeBSD >13)
 LEGACY_DESC=	Older algorithms
 MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete) (requires LEGACY)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
 MODULES_DESC=	Provider modules
 NEXTPROTONEG_DESC=	Next Protocol Negotiation (SPDY)
 OPTIMIZE_DESC=	Optimizations
 PROTOCOLS_DESC=	Protocol Support
 QUIC_DESC=	HTTP/3
 RC2_DESC=	RC2 (unsafe)
 RC4_DESC=	RC4 (unsafe)
 RC5_DESC=	RC5 (patented)
 RMD160_DESC=	RIPEMD-160
 RFC3779_DESC=	RFC3779 support (BGP)
 SCTP_DESC=	SCTP (Stream Control Transmission)
 SHARED_DESC=	Build shared libraries
 SM2_DESC=	SM2 Elliptic Curve DH (Chinese standard)
 SM3_DESC=	SM3 256bit (Chinese standard)
 SM4_DESC=	SM4 128bit (Chinese standard)
 SSE2_DESC=	Runtime SSE2 detection
 SSL3_DESC=	SSLv3 (unsafe)
 TLS1_DESC=	TLSv1.0 (requires TLS1_1, TLS1_2)
 TLS1_1_DESC=	TLSv1.1 (requires TLS1_2)
 TLS1_2_DESC=	TLSv1.2
 THREADPOOL_DESC=Thread Pooling support
 WEAK-SSL-CIPHERS_DESC=	Weak cipher support (unsafe)
 
 # Upstream default disabled options
 .for _option in brotli fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib zstd
 ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
 .for _option in aria asm async ct des gost idea md4 mdc2 legacy \
 	nextprotoneg quic rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 \
 	sse2 threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
 
 MD2_IMPLIES=	LEGACY
 MDC2_IMPLIES=	DES
 TLS1_IMPLIES=	TLS1_1
 TLS1_1_IMPLIES=	TLS1_2
 
 BROTLI_CFLAGS=		-I${PREFIX}/include
 BROTLI_CONFIGURE_ON=	enable-brotli-dynamic
 BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
 EC_CONFIGURE_ON=	enable-ec_nistp_64_gcc_128
 FIPS_VARS=		shlibs+=lib/ossl-modules/fips.so
 I386_CONFIGURE_ON=	386
 KTLS_BROKEN=		Pending updated KTLS patch
 KTLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ktls
 LEGACY_VARS=		shlibs+=lib/ossl-modules/legacy.so
 MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-util_find-doc-nits
 SHARED_MAKE_ENV=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_PLIST_SUB=	SHLIBVER=${OPENSSL_SHLIBVER}
 SHARED_USE=		ldconfig=yes
 SHARED_VARS=		shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \
 				lib/libssl.so.${OPENSSL_SHLIBVER} \
 				lib/engines-${OPENSSL_SHLIBVER}/capi.so \
 				lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \
 				lib/engines-${OPENSSL_SHLIBVER}/padlock.so"
 SSL3_CONFIGURE_ON=	enable-ssl3 enable-ssl3-method
 THREADPOOL_CONFIGURE_OFF=	no-thread-pool
 ZLIB_CONFIGURE_ON=	zlib-dynamic
 ZSTD_CFLAGS=		-I${PREFIX}/include
 ZSTD_CONFIGURE_ON=	enable-zstd-dynamic
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit:^${DISTVERSION:R:S/./\./g}\.
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	BSD-ppc64
 .elif ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	BSD-ppc64le
 .elif ${ARCH} == riscv64
 CONFIGURE_ARGS+=	BSD-riscv64
 .endif
 
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
 PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
 
 .include "version.mk"
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \
 		${WRKSRC}/Configurations/unix-Makefile.tmpl
 	${REINPLACE_CMD} 's|SHLIB_VERSION=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
 	( cd ${WRKSRC} ; ${PERL} configdata.pm --dump )
 
 post-configure-MAN3-off:
 	${REINPLACE_CMD} \
 		-e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \
 		-e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \
 		${WRKSRC}/Makefile
 
 post-install-SHARED-on:
 .for i in ${SHLIBS}
 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i
 .endfor
 
 post-install-SHARED-off:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-12
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl
 
 post-install-MAN3-on:
 	( cd ${STAGEDIR}/${PREFIX} ; find share/man/man3 -not -type d ; \
 		find share/man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl34/pkg-plist b/security/openssl34/pkg-plist
index ac741cf1c88c..71e3793eb46d 100644
--- a/security/openssl34/pkg-plist
+++ b/security/openssl34/pkg-plist
@@ -1,283 +1,283 @@
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1err.h
 include/openssl/asn1t.h
 include/openssl/async.h
 include/openssl/asyncerr.h
 include/openssl/bio.h
 include/openssl/bioerr.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/camellia.h
 include/openssl/cast.h
 include/openssl/cmac.h
 include/openssl/cmp.h
 include/openssl/cmp_util.h
 include/openssl/cmperr.h
 include/openssl/cms.h
 include/openssl/cmserr.h
 include/openssl/comp.h
 include/openssl/comperr.h
 include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/conferr.h
 include/openssl/configuration.h
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
 include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
 include/openssl/ct.h
 include/openssl/cterr.h
 include/openssl/decoder.h
 include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/e_ostime.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
 include/openssl/encoder.h
 include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
 include/openssl/ess.h
 include/openssl/esserr.h
 include/openssl/evp.h
 include/openssl/evperr.h
 include/openssl/fips_names.h
 include/openssl/fipskey.h
 include/openssl/hmac.h
 include/openssl/hpke.h
 include/openssl/http.h
 include/openssl/httperr.h
 include/openssl/idea.h
 include/openssl/indicator.h
 include/openssl/kdf.h
 include/openssl/kdferr.h
 include/openssl/lhash.h
 include/openssl/macros.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
 include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/objectserr.h
 include/openssl/ocsp.h
 include/openssl/ocsperr.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/param_build.h
 include/openssl/params.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pemerr.h
 include/openssl/pkcs12.h
 include/openssl/pkcs12err.h
 include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/quic.h
 include/openssl/rand.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl3.h
 include/openssl/sslerr.h
 include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/store.h
 include/openssl/storeerr.h
 include/openssl/symhacks.h
 include/openssl/thread.h
 include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/ts.h
 include/openssl/tserr.h
 include/openssl/txt_db.h
 include/openssl/types.h
 include/openssl/ui.h
 include/openssl/uierr.h
 include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_acert.h
 include/openssl/x509_vfy.h
 include/openssl/x509err.h
 include/openssl/x509v3.h
 include/openssl/x509v3err.h
 lib/cmake/OpenSSL/OpenSSLConfig.cmake
 lib/cmake/OpenSSL/OpenSSLConfigVersion.cmake
 %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so
-%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
+%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/loader_attic.so
 %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so
 lib/libcrypto.a
 %%SHARED%%lib/libcrypto.so
 %%SHARED%%lib/libcrypto.so.%%SHLIBVER%%
 lib/libssl.a
 %%SHARED%%lib/libssl.so
 %%SHARED%%lib/libssl.so.%%SHLIBVER%%
 %%FIPS%%%%SHARED%%lib/ossl-modules/fips.so
 %%LEGACY%%%%SHARED%%lib/ossl-modules/legacy.so
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
 share/man/man1/CA.pl.1ossl.gz
 share/man/man1/asn1parse.1ossl.gz
 share/man/man1/c_rehash.1ossl.gz
 share/man/man1/ca.1ossl.gz
 share/man/man1/ciphers.1ossl.gz
 share/man/man1/cmp.1ossl.gz
 share/man/man1/cms.1ossl.gz
 share/man/man1/crl.1ossl.gz
 share/man/man1/crl2pkcs7.1ossl.gz
 share/man/man1/dgst.1ossl.gz
 share/man/man1/dhparam.1ossl.gz
 share/man/man1/dsa.1ossl.gz
 share/man/man1/dsaparam.1ossl.gz
 share/man/man1/ec.1ossl.gz
 share/man/man1/ecparam.1ossl.gz
 share/man/man1/enc.1ossl.gz
 share/man/man1/engine.1ossl.gz
 share/man/man1/errstr.1ossl.gz
 share/man/man1/gendsa.1ossl.gz
 share/man/man1/genpkey.1ossl.gz
 share/man/man1/genrsa.1ossl.gz
 share/man/man1/info.1ossl.gz
 share/man/man1/kdf.1ossl.gz
 share/man/man1/mac.1ossl.gz
 share/man/man1/nseq.1ossl.gz
 share/man/man1/ocsp.1ossl.gz
 share/man/man1/openssl-asn1parse.1ossl.gz
 share/man/man1/openssl-ca.1ossl.gz
 share/man/man1/openssl-ciphers.1ossl.gz
 share/man/man1/openssl-cmds.1ossl.gz
 share/man/man1/openssl-cmp.1ossl.gz
 share/man/man1/openssl-cms.1ossl.gz
 share/man/man1/openssl-crl.1ossl.gz
 share/man/man1/openssl-crl2pkcs7.1ossl.gz
 share/man/man1/openssl-dgst.1ossl.gz
 share/man/man1/openssl-dhparam.1ossl.gz
 share/man/man1/openssl-dsa.1ossl.gz
 share/man/man1/openssl-dsaparam.1ossl.gz
 share/man/man1/openssl-ec.1ossl.gz
 share/man/man1/openssl-ecparam.1ossl.gz
 share/man/man1/openssl-enc.1ossl.gz
 share/man/man1/openssl-engine.1ossl.gz
 share/man/man1/openssl-errstr.1ossl.gz
 share/man/man1/openssl-fipsinstall.1ossl.gz
 share/man/man1/openssl-format-options.1ossl.gz
 share/man/man1/openssl-gendsa.1ossl.gz
 share/man/man1/openssl-genpkey.1ossl.gz
 share/man/man1/openssl-genrsa.1ossl.gz
 share/man/man1/openssl-info.1ossl.gz
 share/man/man1/openssl-kdf.1ossl.gz
 share/man/man1/openssl-list.1ossl.gz
 share/man/man1/openssl-mac.1ossl.gz
 share/man/man1/openssl-namedisplay-options.1ossl.gz
 share/man/man1/openssl-nseq.1ossl.gz
 share/man/man1/openssl-ocsp.1ossl.gz
 share/man/man1/openssl-passphrase-options.1ossl.gz
 share/man/man1/openssl-passwd.1ossl.gz
 share/man/man1/openssl-pkcs12.1ossl.gz
 share/man/man1/openssl-pkcs7.1ossl.gz
 share/man/man1/openssl-pkcs8.1ossl.gz
 share/man/man1/openssl-pkey.1ossl.gz
 share/man/man1/openssl-pkeyparam.1ossl.gz
 share/man/man1/openssl-pkeyutl.1ossl.gz
 share/man/man1/openssl-prime.1ossl.gz
 share/man/man1/openssl-rand.1ossl.gz
 share/man/man1/openssl-rehash.1ossl.gz
 share/man/man1/openssl-req.1ossl.gz
 share/man/man1/openssl-rsa.1ossl.gz
 share/man/man1/openssl-rsautl.1ossl.gz
 share/man/man1/openssl-s_client.1ossl.gz
 share/man/man1/openssl-s_server.1ossl.gz
 share/man/man1/openssl-s_time.1ossl.gz
 share/man/man1/openssl-sess_id.1ossl.gz
 share/man/man1/openssl-smime.1ossl.gz
 share/man/man1/openssl-speed.1ossl.gz
 share/man/man1/openssl-spkac.1ossl.gz
 share/man/man1/openssl-srp.1ossl.gz
 share/man/man1/openssl-storeutl.1ossl.gz
 share/man/man1/openssl-ts.1ossl.gz
 share/man/man1/openssl-verification-options.1ossl.gz
 share/man/man1/openssl-verify.1ossl.gz
 share/man/man1/openssl-version.1ossl.gz
 share/man/man1/openssl-x509.1ossl.gz
 share/man/man1/openssl.1ossl.gz
 share/man/man1/passwd.1ossl.gz
 share/man/man1/pkcs12.1ossl.gz
 share/man/man1/pkcs7.1ossl.gz
 share/man/man1/pkcs8.1ossl.gz
 share/man/man1/pkey.1ossl.gz
 share/man/man1/pkeyparam.1ossl.gz
 share/man/man1/pkeyutl.1ossl.gz
 share/man/man1/prime.1ossl.gz
 share/man/man1/rand.1ossl.gz
 share/man/man1/rehash.1ossl.gz
 share/man/man1/req.1ossl.gz
 share/man/man1/rsa.1ossl.gz
 share/man/man1/rsautl.1ossl.gz
 share/man/man1/s_client.1ossl.gz
 share/man/man1/s_server.1ossl.gz
 share/man/man1/s_time.1ossl.gz
 share/man/man1/sess_id.1ossl.gz
 share/man/man1/smime.1ossl.gz
 share/man/man1/speed.1ossl.gz
 share/man/man1/spkac.1ossl.gz
 share/man/man1/srp.1ossl.gz
 share/man/man1/storeutl.1ossl.gz
 share/man/man1/ts.1ossl.gz
 share/man/man1/tsget.1ossl.gz
 share/man/man1/verify.1ossl.gz
 share/man/man1/version.1ossl.gz
 share/man/man1/x509.1ossl.gz
 share/man/man5/config.5ossl.gz
 share/man/man5/fips_config.5ossl.gz
 share/man/man5/x509v3_config.5ossl.gz
 %%OPENSSLDIR%%/misc/CA.pl
 @comment %%OPENSSLDIR%%/misc/tsget.pl
 %%OPENSSLDIR%%/misc/tsget
 @sample %%OPENSSLDIR%%/ct_log_list.cnf.dist %%OPENSSLDIR%%/ct_log_list.cnf
 %%FIPS%%%%OPENSSLDIR%%/fipsmodule.cnf
 @sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf
 @dir lib/ossl-modules
 @dir %%OPENSSLDIR%%/private
 @dir %%OPENSSLDIR%%/certs