summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl/interop/version/Makefile
diff options
context:
space:
mode:
authortb <>2023-10-30 17:15:21 +0000
committertb <>2023-10-30 17:15:21 +0000
commitbc08093d61a7c129c8e10c0201e9f3ab3167593f (patch)
treec5fce117c872d075f932d494bd786f9804e73c8c /src/regress/lib/libssl/interop/version/Makefile
parente961968230ef9656870099b75ce61f5a340c5b06 (diff)
downloadopenbsd-bc08093d61a7c129c8e10c0201e9f3ab3167593f.tar.gz
openbsd-bc08093d61a7c129c8e10c0201e9f3ab3167593f.tar.bz2
openbsd-bc08093d61a7c129c8e10c0201e9f3ab3167593f.zip
Add support for OpenSSL 3.1 interop tests
Until OpenSSL 3.1 has replaced OpenSSL 3.0 on most architectures, run both tests. Installed packages of OpenSSL 3.0 will update automatically to 3.1, so regress runners should not need to do anything.
Diffstat (limited to '')
-rw-r--r--src/regress/lib/libssl/interop/version/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile
index c4f7705d63..bb4641afa9 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.7 2023/07/02 17:21:32 beck Exp $ 1# $OpenBSD: Makefile,v 1.8 2023/10/30 17:15:21 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
@@ -13,6 +13,9 @@ LIBRARIES += openssl11
13.if exists(/usr/local/bin/eopenssl30) 13.if exists(/usr/local/bin/eopenssl30)
14LIBRARIES += openssl30 14LIBRARIES += openssl30
15.endif 15.endif
16.if exists(/usr/local/bin/eopenssl31)
17LIBRARIES += openssl31
18.endif
16 19
17VERSIONS = any TLS1_2 TLS1_3 20VERSIONS = any TLS1_2 TLS1_3
18 21
@@ -29,7 +32,8 @@ FAIL_${cver}_${sver} = !
29.for slib in ${LIBRARIES} 32.for slib in ${LIBRARIES}
30 33
31.if ("${cver}" != TLS1_3 && "${sver}" != TLS1_3) && \ 34.if ("${cver}" != TLS1_3 && "${sver}" != TLS1_3) && \
32 (("${clib}" != openssl30 && "${slib}" != openssl30) || \ 35 ((("${clib}" != openssl30 && "${slib}" != openssl30) && \
36 ("${clib}" != openssl31 && "${slib}" != openssl31)) || \
33 (("${cver}" != any && "${sver}" != any) && \ 37 (("${cver}" != any && "${sver}" != any) && \
34 ("${cver}" != TLS1 && "${sver}" != TLS1) && \ 38 ("${cver}" != TLS1 && "${sver}" != TLS1) && \
35 ("${cver}" != TLS1_1 && "${sver}" != TLS1_1))) 39 ("${cver}" != TLS1_1 && "${sver}" != TLS1_1)))