Page MenuHomeFreeBSD
Files F156957011

D47833.id148520.diff
No OneTemporary
Actions

D47833.id148520.diff
View Options

diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile
--- a/security/openssl-quictls/Makefile
+++ b/security/openssl-quictls/Makefile
@@ -45,12 +45,11 @@
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 @@
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
--- a/security/openssl-quictls/pkg-plist
+++ b/security/openssl-quictls/pkg-plist
@@ -137,7 +137,7 @@
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
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -40,13 +40,11 @@
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 @@
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
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -136,7 +136,7 @@
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
--- a/security/openssl111/Makefile
+++ b/security/openssl111/Makefile
@@ -43,13 +43,11 @@
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 @@
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
--- a/security/openssl31-quictls/Makefile
+++ b/security/openssl31-quictls/Makefile
@@ -45,13 +45,11 @@
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 @@
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
--- a/security/openssl31-quictls/pkg-plist
+++ b/security/openssl31-quictls/pkg-plist
@@ -137,7 +137,7 @@
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
--- a/security/openssl31/Makefile
+++ b/security/openssl31/Makefile
@@ -42,13 +42,11 @@
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 @@
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
--- a/security/openssl31/pkg-plist
+++ b/security/openssl31/pkg-plist
@@ -136,7 +136,7 @@
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
--- a/security/openssl32/Makefile
+++ b/security/openssl32/Makefile
@@ -41,15 +41,13 @@
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 @@
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
--- a/security/openssl32/pkg-plist
+++ b/security/openssl32/pkg-plist
@@ -140,7 +140,7 @@
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
--- a/security/openssl33/Makefile
+++ b/security/openssl33/Makefile
@@ -41,15 +41,13 @@
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 @@
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
--- a/security/openssl33/pkg-plist
+++ b/security/openssl33/pkg-plist
@@ -142,7 +142,7 @@
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
--- a/security/openssl34/Makefile
+++ b/security/openssl34/Makefile
@@ -38,15 +38,13 @@
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 @@
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
--- a/security/openssl34/pkg-plist
+++ b/security/openssl34/pkg-plist
@@ -144,7 +144,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 3:34 PM (12 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33254361
Default Alt Text
D47833.id148520.diff (10 KB)

Event Timeline