diff options
| author | tb <> | 2023-01-27 08:28:36 +0000 |
|---|---|---|
| committer | tb <> | 2023-01-27 08:28:36 +0000 |
| commit | 6738561f9181a99b8aa084f27caeea50afddc836 (patch) | |
| tree | 8c840e3c446da9e4d3e54e0fceea866197047f66 /src/regress/lib/libssl/interop/version | |
| parent | 5eb039b0fc4e1e87f2b77fc8150abd2c9f9f518b (diff) | |
| download | openbsd-6738561f9181a99b8aa084f27caeea50afddc836.tar.gz openbsd-6738561f9181a99b8aa084f27caeea50afddc836.tar.bz2 openbsd-6738561f9181a99b8aa084f27caeea50afddc836.zip | |
Add openssl 3.0 interop tests
The plan is to retire the 1.0.2 interop tests soon so as to be able to
drop the dead and dangerous OpenSSL 1.0.2 port.
The cert part is extremely slow on arm64: the whole interop test on an m1
is about 10x slower (~45 min!) than on a modern amd64 laptop, so people
running regress may want to wait a bit with adding OpenSSL 3 to their test
boxes until this is sorted out.
Diffstat (limited to 'src/regress/lib/libssl/interop/version')
| -rw-r--r-- | src/regress/lib/libssl/interop/version/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile index 7ac86ccbeb..7b1be9a3ed 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.3 2020/12/17 00:51:12 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.4 2023/01/27 08:28:36 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.0.2, or openssl 1.1. Pin client or server to a fixed TLS | 4 | # openssl 1.0.2, or openssl 1.1. Pin client or server to a fixed TLS |
| @@ -13,6 +13,9 @@ LIBRARIES += openssl | |||
| 13 | .if exists(/usr/local/bin/eopenssl11) | 13 | .if exists(/usr/local/bin/eopenssl11) |
| 14 | LIBRARIES += openssl11 | 14 | LIBRARIES += openssl11 |
| 15 | .endif | 15 | .endif |
| 16 | .if exists(/usr/local/bin/eopenssl30) | ||
| 17 | LIBRARIES += openssl30 | ||
| 18 | .endif | ||
| 16 | 19 | ||
| 17 | VERSIONS = any TLS1 TLS1_1 TLS1_2 TLS1_3 | 20 | VERSIONS = any TLS1 TLS1_1 TLS1_2 TLS1_3 |
| 18 | 21 | ||
| @@ -28,8 +31,12 @@ FAIL_${cver}_${sver} = ! | |||
| 28 | .for clib in ${LIBRARIES} | 31 | .for clib in ${LIBRARIES} |
| 29 | .for slib in ${LIBRARIES} | 32 | .for slib in ${LIBRARIES} |
| 30 | 33 | ||
| 31 | .if ("${clib}" != openssl && "${slib}" != openssl) || \ | 34 | .if (("${clib}" != openssl && "${slib}" != openssl) || \ |
| 32 | ("${cver}" != TLS1_3 && "${sver}" != TLS1_3) | 35 | ("${cver}" != TLS1_3 && "${sver}" != TLS1_3)) && \ |
| 36 | (("${clib}" != openssl30 && "${slib}" != openssl30) || \ | ||
| 37 | (("${cver}" != any && "${sver}" != any) && \ | ||
| 38 | ("${cver}" != TLS1 && "${sver}" != TLS1) && \ | ||
| 39 | ("${cver}" != TLS1_1 && "${sver}" != TLS1_1))) | ||
| 33 | 40 | ||
| 34 | .if ("${clib}" == "libressl" || "${slib}" == "libressl") | 41 | .if ("${clib}" == "libressl" || "${slib}" == "libressl") |
| 35 | REGRESS_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver} | 42 | REGRESS_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver} |
