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/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile
index 3a116d5ed5..70eaeec44c 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.14 2024/02/03 15:58:34 beck Exp $ 1# $OpenBSD: Makefile,v 1.15 2024/08/18 09:14:17 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
@@ -16,6 +16,9 @@ LIBRARIES += openssl30
16.if exists(/usr/local/bin/eopenssl31) 16.if exists(/usr/local/bin/eopenssl31)
17LIBRARIES += openssl31 17LIBRARIES += openssl31
18.endif 18.endif
19.if exists(/usr/local/bin/eopenssl32)
20LIBRARIES += openssl32
21.endif
19 22
20CLEANFILES = *.tmp *.ciphers ciphers.mk 23CLEANFILES = *.tmp *.ciphers ciphers.mk
21 24
@@ -46,7 +49,8 @@ client-${clib}-server-${slib}.ciphers: \
46 sort $@ client-libressl.ciphers >$@.tmp 49 sort $@ client-libressl.ciphers >$@.tmp
47. if "${clib}" == "openssl11" || "${slib}" == "openssl11" || \ 50. if "${clib}" == "openssl11" || "${slib}" == "openssl11" || \
48 "${clib}" == "openssl30" || "${slib}" == "openssl30" || \ 51 "${clib}" == "openssl30" || "${slib}" == "openssl30" || \
49 "${clib}" == "openssl31" || "${slib}" == "openssl31" 52 "${clib}" == "openssl31" || "${slib}" == "openssl31" || \
53 "${clib}" == "openssl32" || "${slib}" == "openssl32"
50 # OpenSSL's SSL_CTX_set_cipher_list doesn't accept TLSv1.3 ciphers 54 # OpenSSL's SSL_CTX_set_cipher_list doesn't accept TLSv1.3 ciphers
51 sed -i '/^TLS_/d' $@.tmp 55 sed -i '/^TLS_/d' $@.tmp
52. endif 56. endif
@@ -76,6 +80,8 @@ regress: ciphers.mk
76LEVEL_libressl = 80LEVEL_libressl =
77LEVEL_openssl11 = ,@SECLEVEL=0 81LEVEL_openssl11 = ,@SECLEVEL=0
78LEVEL_openssl30 = ,@SECLEVEL=0 82LEVEL_openssl30 = ,@SECLEVEL=0
83LEVEL_openssl31 = ,@SECLEVEL=0
84LEVEL_openssl32 = ,@SECLEVEL=0
79 85
80.for clib in ${LIBRARIES} 86.for clib in ${LIBRARIES}
81.for slib in ${LIBRARIES} 87.for slib in ${LIBRARIES}
@@ -136,7 +142,7 @@ check-cipher-${cipher}-client-${clib}-server-${slib}: \
136. endif 142. endif
137. if "${clib}" == "libressl" 143. if "${clib}" == "libressl"
138 # libressl client may prefer chacha-poly if aes-ni is not supported 144 # libressl client may prefer chacha-poly if aes-ni is not supported
139. if "${slib}" == "openssl11" || "${slib}" == "openssl30" || "${slib}" == "openssl31" 145. if "${slib}" == "openssl11" || "${slib}" == "openssl30" || "${slib}" == "openssl31" || "${slib}" == "openssl32"
140 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out 146 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out
141. else 147. else
142 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out 148 egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out