diff options
Diffstat (limited to 'src/regress/lib/libssl/interop/version/Makefile')
-rw-r--r-- | src/regress/lib/libssl/interop/version/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
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) |
11 | LIBRARIES += openssl11 | 11 | LIBRARIES += openssl11 |
12 | .endif | 12 | .endif |
13 | .if exists(/usr/local/bin/eopenssl30) | ||
14 | LIBRARIES += openssl30 | ||
15 | .endif | ||
16 | .if exists(/usr/local/bin/eopenssl31) | 13 | .if exists(/usr/local/bin/eopenssl31) |
17 | LIBRARIES += openssl31 | 14 | LIBRARIES += 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))) |