summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl/interop/cipher/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/regress/lib/libssl/interop/cipher/Makefile')
-rw-r--r--src/regress/lib/libssl/interop/cipher/Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile
index 70eaeec44c..bf4a1e28dc 100644
--- a/src/regress/lib/libssl/interop/cipher/Makefile
+++ b/src/regress/lib/libssl/interop/cipher/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.15 2024/08/18 09:14:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.16 2024/08/18 10:02:10 tb Exp $
2 2
3# Connect a client to a server. Both can be current libressl, or 3# Connect a client to a server. Both can be current libressl, or
4# openssl 1.1 or 3.0. Create lists of supported ciphers 4# openssl 1.1 or 3.0. Create lists of supported ciphers
@@ -10,9 +10,6 @@ LIBRARIES = libressl
10.if exists(/usr/local/bin/eopenssl11) 10.if exists(/usr/local/bin/eopenssl11)
11LIBRARIES += openssl11 11LIBRARIES += openssl11
12.endif 12.endif
13.if exists(/usr/local/bin/eopenssl30)
14LIBRARIES += openssl30
15.endif
16.if exists(/usr/local/bin/eopenssl31) 13.if exists(/usr/local/bin/eopenssl31)
17LIBRARIES += openssl31 14LIBRARIES += openssl31
18.endif 15.endif
@@ -48,7 +45,6 @@ client-${clib}-server-${slib}.ciphers: \
48 # we are only interested in ciphers supported by libressl 45 # we are only interested in ciphers supported by libressl
49 sort $@ client-libressl.ciphers >$@.tmp 46 sort $@ client-libressl.ciphers >$@.tmp
50. if "${clib}" == "openssl11" || "${slib}" == "openssl11" || \ 47. if "${clib}" == "openssl11" || "${slib}" == "openssl11" || \
51 "${clib}" == "openssl30" || "${slib}" == "openssl30" || \
52 "${clib}" == "openssl31" || "${slib}" == "openssl31" || \ 48 "${clib}" == "openssl31" || "${slib}" == "openssl31" || \
53 "${clib}" == "openssl32" || "${slib}" == "openssl32" 49 "${clib}" == "openssl32" || "${slib}" == "openssl32"
54 # OpenSSL's SSL_CTX_set_cipher_list doesn't accept TLSv1.3 ciphers 50 # OpenSSL's SSL_CTX_set_cipher_list doesn't accept TLSv1.3 ciphers
@@ -79,7 +75,6 @@ regress: ciphers.mk
79 75
80LEVEL_libressl = 76LEVEL_libressl =
81LEVEL_openssl11 = ,@SECLEVEL=0 77LEVEL_openssl11 = ,@SECLEVEL=0
82LEVEL_openssl30 = ,@SECLEVEL=0
83LEVEL_openssl31 = ,@SECLEVEL=0 78LEVEL_openssl31 = ,@SECLEVEL=0
84LEVEL_openssl32 = ,@SECLEVEL=0 79LEVEL_openssl32 = ,@SECLEVEL=0
85 80
@@ -142,7 +137,7 @@ check-cipher-${cipher}-client-${clib}-server-${slib}: \
142. endif 137. endif
143. if "${clib}" == "libressl" 138. if "${clib}" == "libressl"
144 # libressl client may prefer chacha-poly if aes-ni is not supported 139 # libressl client may prefer chacha-poly if aes-ni is not supported
145. if "${slib}" == "openssl11" || "${slib}" == "openssl30" || "${slib}" == "openssl31" || "${slib}" == "openssl32" 140. if "${slib}" == "openssl11" || "${slib}" == "openssl31" || "${slib}" == "openssl32"
146 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out 141 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out
147. else 142. else
148 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out 143 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out