git: 2c226771afe4 - main - security/openssl: Remove defunct CRYPTODEV option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 29 Dec 2024 13:12:15 UTC
The branch main has been updated by brnrd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2c226771afe4f62cab21dfb965b17f1a02d1bc58
commit 2c226771afe4f62cab21dfb965b17f1a02d1bc58
Author: Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-12-29 13:10:32 +0000
Commit: Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-12-29 13:10:32 +0000
security/openssl: Remove defunct CRYPTODEV option
Option irrelevant for FreeBSD 13+
Differential Revision: https://reviews.freebsd.org/D47833
---
security/openssl-quictls/Makefile | 4 +---
security/openssl-quictls/pkg-plist | 2 +-
security/openssl/Makefile | 5 +----
security/openssl/pkg-plist | 2 +-
security/openssl111/Makefile | 5 +----
security/openssl31-quictls/Makefile | 5 +----
security/openssl31-quictls/pkg-plist | 2 +-
security/openssl31/Makefile | 5 +----
security/openssl31/pkg-plist | 2 +-
security/openssl32/Makefile | 5 +----
security/openssl32/pkg-plist | 2 +-
security/openssl33/Makefile | 5 +----
security/openssl33/pkg-plist | 2 +-
security/openssl34/Makefile | 5 +----
security/openssl34/pkg-plist | 2 +-
15 files changed, 15 insertions(+), 38 deletions(-)
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
@@ -45,12 +45,11 @@ 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
@@ -67,7 +66,6 @@ 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
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
@@ -137,7 +137,7 @@ 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
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index daf95407a8ab..c9e7409e08f6 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -40,13 +40,11 @@ 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"
@@ -59,7 +57,6 @@ 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
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
@@ -136,7 +136,7 @@ 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
diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile
index c64c4aab068a..b88948d4dcc3 100644
--- a/security/openssl111/Makefile
+++ b/security/openssl111/Makefile
@@ -43,13 +43,11 @@ 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"
@@ -62,7 +60,6 @@ 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
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
@@ -45,13 +45,11 @@ 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
@@ -68,7 +66,6 @@ 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
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
@@ -137,7 +137,7 @@ 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
diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile
index 0c27060eafb4..6bb8972f57dc 100644
--- a/security/openssl31/Makefile
+++ b/security/openssl31/Makefile
@@ -42,13 +42,11 @@ 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"
@@ -63,7 +61,6 @@ 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
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
@@ -136,7 +136,7 @@ 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
diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile
index bf39bd99a472..704a1ec82142 100644
--- a/security/openssl32/Makefile
+++ b/security/openssl32/Makefile
@@ -41,15 +41,13 @@ 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"
@@ -65,7 +63,6 @@ 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
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
@@ -140,7 +140,7 @@ 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
diff --git a/security/openssl33/Makefile b/security/openssl33/Makefile
index 8253e72508b1..d0f5da476ba8 100644
--- a/security/openssl33/Makefile
+++ b/security/openssl33/Makefile
@@ -41,15 +41,13 @@ 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"
@@ -65,7 +63,6 @@ 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
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
@@ -142,7 +142,7 @@ 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
diff --git a/security/openssl34/Makefile b/security/openssl34/Makefile
index e959d49ccdb9..b4819f02f87d 100644
--- a/security/openssl34/Makefile
+++ b/security/openssl34/Makefile
@@ -38,15 +38,13 @@ 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"
@@ -62,7 +60,6 @@ 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
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
@@ -144,7 +144,7 @@ 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