summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl
diff options
context:
space:
mode:
authortb <>2024-08-18 10:02:10 +0000
committertb <>2024-08-18 10:02:10 +0000
commit7216f02185745b3f4f3df0e5e353a924243485a3 (patch)
tree5700c81215ca88e684b62c7707e3ed7026bbe9b6 /src/regress/lib/libssl
parent9bf6dcf903a69a1bdcb775ae3133c6e4a34714d9 (diff)
downloadopenbsd-7216f02185745b3f4f3df0e5e353a924243485a3.tar.gz
openbsd-7216f02185745b3f4f3df0e5e353a924243485a3.tar.bz2
openbsd-7216f02185745b3f4f3df0e5e353a924243485a3.zip
Drop OpenSSL 3.0 interop testing infrastructure
The openssl 3.0 port was removed nearly a year ago shortly after the 7.4 release.
Diffstat (limited to 'src/regress/lib/libssl')
-rw-r--r--src/regress/lib/libssl/interop/Makefile6
-rw-r--r--src/regress/lib/libssl/interop/botan/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/cert/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/cipher/Makefile9
-rw-r--r--src/regress/lib/libssl/interop/netcat/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/openssl30/Makefile43
-rw-r--r--src/regress/lib/libssl/interop/session/Makefile5
-rw-r--r--src/regress/lib/libssl/interop/version/Makefile8
8 files changed, 11 insertions, 75 deletions
diff --git a/src/regress/lib/libssl/interop/Makefile b/src/regress/lib/libssl/interop/Makefile
index 0a545aded7..21dfce359d 100644
--- a/src/regress/lib/libssl/interop/Makefile
+++ b/src/regress/lib/libssl/interop/Makefile
@@ -1,6 +1,6 @@
1# $OpenBSD: Makefile,v 1.19 2024/08/18 09:14:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.20 2024/08/18 10:02:10 tb Exp $
2 2
3SUBDIR = libressl openssl11 openssl30 openssl31 openssl32 3SUBDIR = libressl openssl11 openssl31 openssl32
4 4
5# the above binaries must have been built before we can continue 5# the above binaries must have been built before we can continue
6SUBDIR += netcat 6SUBDIR += netcat
@@ -10,7 +10,7 @@ SUBDIR += botan
10# What is below takes a long time. 10# What is below takes a long time.
11# setting REGRESS_SKIP_SLOW to "yes" in mk.conf 11# setting REGRESS_SKIP_SLOW to "yes" in mk.conf
12# will skip the tests that do not test libressl 12# will skip the tests that do not test libressl
13# but do things like test openssl11 to openssl30 13# but do things like test openssl11 to openssl 3
14SUBDIR += version 14SUBDIR += version
15SUBDIR += cipher 15SUBDIR += cipher
16# This takes a really long time. 16# This takes a really long time.
diff --git a/src/regress/lib/libssl/interop/botan/Makefile b/src/regress/lib/libssl/interop/botan/Makefile
index acc350a936..e20553012a 100644
--- a/src/regress/lib/libssl/interop/botan/Makefile
+++ b/src/regress/lib/libssl/interop/botan/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.8 2024/08/18 09:14:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.9 2024/08/18 10:02:10 tb Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
@@ -23,9 +23,6 @@ LIBRARIES = libressl
23.if exists(/usr/local/bin/eopenssl11) 23.if exists(/usr/local/bin/eopenssl11)
24LIBRARIES += openssl11 24LIBRARIES += openssl11
25.endif 25.endif
26.if exists(/usr/local/bin/eopenssl30)
27LIBRARIES += openssl30
28.endif
29.if exists(/usr/local/bin/eopenssl31) 26.if exists(/usr/local/bin/eopenssl31)
30LIBRARIES += openssl31 27LIBRARIES += openssl31
31.endif 28.endif
diff --git a/src/regress/lib/libssl/interop/cert/Makefile b/src/regress/lib/libssl/interop/cert/Makefile
index 8c37d8a4f8..ab35d03d74 100644
--- a/src/regress/lib/libssl/interop/cert/Makefile
+++ b/src/regress/lib/libssl/interop/cert/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.12 2024/08/18 09:14:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.13 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 client and server certificates 4# openssl 1.1 or 3.0. Create client and server certificates
@@ -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
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
diff --git a/src/regress/lib/libssl/interop/netcat/Makefile b/src/regress/lib/libssl/interop/netcat/Makefile
index 3e3e4efd1e..ee6fc7e103 100644
--- a/src/regress/lib/libssl/interop/netcat/Makefile
+++ b/src/regress/lib/libssl/interop/netcat/Makefile
@@ -1,12 +1,9 @@
1# $OpenBSD: Makefile,v 1.8 2024/08/18 09:14:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.9 2024/08/18 10:02:10 tb Exp $
2 2
3LIBRARIES = libressl 3LIBRARIES = libressl
4.if exists(/usr/local/bin/eopenssl11) 4.if exists(/usr/local/bin/eopenssl11)
5LIBRARIES += openssl11 5LIBRARIES += openssl11
6.endif 6.endif
7.if exists(/usr/local/bin/eopenssl30)
8LIBRARIES += openssl30
9.endif
10.if exists(/usr/local/bin/eopenssl31) 7.if exists(/usr/local/bin/eopenssl31)
11LIBRARIES += openssl31 8LIBRARIES += openssl31
12.endif 9.endif
diff --git a/src/regress/lib/libssl/interop/openssl30/Makefile b/src/regress/lib/libssl/interop/openssl30/Makefile
deleted file mode 100644
index d667d1b17e..0000000000
--- a/src/regress/lib/libssl/interop/openssl30/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
1# $OpenBSD: Makefile,v 1.1 2023/01/27 08:28:36 tb Exp $
2
3.if ! exists(/usr/local/bin/eopenssl30)
4regress:
5 # install openssl-3.0 from ports for interop tests
6 @echo 'Run "pkg_add openssl--%3.0" to run tests against OpenSSL 3.0'
7 @echo SKIPPED
8.else
9
10PROGS = client server
11CPPFLAGS = -I /usr/local/include/eopenssl30
12LDFLAGS = -L /usr/local/lib/eopenssl30
13LDADD = -lssl -lcrypto
14DPADD = /usr/local/lib/eopenssl30/libssl.a \
15 /usr/local/lib/eopenssl30/libcrypto.a
16LD_LIBRARY_PATH = /usr/local/lib/eopenssl30
17REGRESS_TARGETS = run-self-client-server
18.for p in ${PROGS}
19REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p
20.endfor
21
22.for p in ${PROGS}
23
24run-ldd-$p: ldd-$p.out
25 # check that $p is linked with OpenSSL 3.0
26 grep -q /usr/local/lib/eopenssl30/libcrypto.so ldd-$p.out
27 grep -q /usr/local/lib/eopenssl30/libssl.so ldd-$p.out
28 # check that $p is not linked with LibreSSL
29 ! grep -v libc.so ldd-$p.out | grep /usr/lib/
30
31run-version-$p: $p-self.out
32 # check that runtime version is OpenSSL 3.0
33 grep 'SSLEAY_VERSION: OpenSSL 3.0' $p-self.out
34
35run-protocol-$p: $p-self.out
36 # check that OpenSSL 3.0 protocol version is TLS 1.3
37 grep 'Protocol *: TLSv1.3' $p-self.out
38
39.endfor
40
41.endif # exists(/usr/local/bin/eopenssl30)
42
43.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/interop/session/Makefile b/src/regress/lib/libssl/interop/session/Makefile
index d1644de3f3..ab6503c97f 100644
--- a/src/regress/lib/libssl/interop/session/Makefile
+++ b/src/regress/lib/libssl/interop/session/Makefile
@@ -1,12 +1,9 @@
1# $OpenBSD: Makefile,v 1.10 2024/08/18 09:14:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.11 2024/08/18 10:02:10 tb Exp $
2 2
3LIBRARIES = libressl 3LIBRARIES = libressl
4.if exists(/usr/local/bin/eopenssl11) 4.if exists(/usr/local/bin/eopenssl11)
5LIBRARIES += openssl11 5LIBRARIES += openssl11
6.endif 6.endif
7.if exists(/usr/local/bin/eopenssl30)
8#LIBRARIES += openssl30
9.endif
10.if exists(/usr/local/bin/eopenssl31) 7.if exists(/usr/local/bin/eopenssl31)
11#LIBRARIES += openssl31 8#LIBRARIES += openssl31
12.endif 9.endif
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile
index bb4641afa9..aa5883fa2d 100644
--- a/src/regress/lib/libssl/interop/version/Makefile
+++ b/src/regress/lib/libssl/interop/version/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.8 2023/10/30 17:15:21 tb Exp $ 1# $OpenBSD: Makefile,v 1.9 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 openssl 3.0. Pin client or server to a fixed TLS 4# openssl 1.1 or openssl 3.0. Pin client or server to a fixed TLS
@@ -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
@@ -32,8 +29,7 @@ FAIL_${cver}_${sver} = !
32.for slib in ${LIBRARIES} 29.for slib in ${LIBRARIES}
33 30
34.if ("${cver}" != TLS1_3 && "${sver}" != TLS1_3) && \ 31.if ("${cver}" != TLS1_3 && "${sver}" != TLS1_3) && \
35 ((("${clib}" != openssl30 && "${slib}" != openssl30) && \ 32 ((("${clib}" != openssl31 && "${slib}" != openssl31)) || \
36 ("${clib}" != openssl31 && "${slib}" != openssl31)) || \
37 (("${cver}" != any && "${sver}" != any) && \ 33 (("${cver}" != any && "${sver}" != any) && \
38 ("${cver}" != TLS1 && "${sver}" != TLS1) && \ 34 ("${cver}" != TLS1 && "${sver}" != TLS1) && \
39 ("${cver}" != TLS1_1 && "${sver}" != TLS1_1))) 35 ("${cver}" != TLS1_1 && "${sver}" != TLS1_1)))
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 20:50:30 +0000