diff options
Diffstat (limited to 'src/regress/lib/libssl/interop/version/Makefile')
-rw-r--r-- | src/regress/lib/libssl/interop/version/Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile index 7b1be9a3ed..1e0af57a66 100644 --- a/src/regress/lib/libssl/interop/version/Makefile +++ b/src/regress/lib/libssl/interop/version/Makefile | |||
@@ -1,15 +1,12 @@ | |||
1 | # $OpenBSD: Makefile,v 1.4 2023/01/27 08:28:36 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.5 2023/02/01 14:39:09 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.1 or openssl 3.0. Pin client or server to a fixed TLS |
5 | # version number. Incompatible versions must fail. Check that client | 5 | # version number. Incompatible versions must fail. Check that client |
6 | # and server have used correct version by grepping in their session | 6 | # and server have used correct version by grepping in their session |
7 | # print out. | 7 | # print out. |
8 | 8 | ||
9 | LIBRARIES = libressl | 9 | LIBRARIES = libressl |
10 | .if exists(/usr/local/bin/eopenssl) | ||
11 | LIBRARIES += openssl | ||
12 | .endif | ||
13 | .if exists(/usr/local/bin/eopenssl11) | 10 | .if exists(/usr/local/bin/eopenssl11) |
14 | LIBRARIES += openssl11 | 11 | LIBRARIES += openssl11 |
15 | .endif | 12 | .endif |
@@ -31,8 +28,7 @@ FAIL_${cver}_${sver} = ! | |||
31 | .for clib in ${LIBRARIES} | 28 | .for clib in ${LIBRARIES} |
32 | .for slib in ${LIBRARIES} | 29 | .for slib in ${LIBRARIES} |
33 | 30 | ||
34 | .if (("${clib}" != openssl && "${slib}" != openssl) || \ | 31 | .if ("${cver}" != TLS1_3 && "${sver}" != TLS1_3) && \ |
35 | ("${cver}" != TLS1_3 && "${sver}" != TLS1_3)) && \ | ||
36 | (("${clib}" != openssl30 && "${slib}" != openssl30) || \ | 32 | (("${clib}" != openssl30 && "${slib}" != openssl30) || \ |
37 | (("${cver}" != any && "${sver}" != any) && \ | 33 | (("${cver}" != any && "${sver}" != any) && \ |
38 | ("${cver}" != TLS1 && "${sver}" != TLS1) && \ | 34 | ("${cver}" != TLS1 && "${sver}" != TLS1) && \ |
@@ -79,13 +75,8 @@ check-version-client-${clib}-${cver}-server-${slib}-${sver}: \ | |||
79 | @grep ' Protocol *: ' ${@:S/^check/server/}.out | 75 | @grep ' Protocol *: ' ${@:S/^check/server/}.out |
80 | .if "${cver}" == any | 76 | .if "${cver}" == any |
81 | .if "${sver}" == any | 77 | .if "${sver}" == any |
82 | .if "${clib}" == openssl || "${slib}" == openssl | ||
83 | grep -q ' Protocol *: TLSv1.2$$' ${@:S/^check/client/}.out | ||
84 | grep -q ' Protocol *: TLSv1.2$$' ${@:S/^check/server/}.out | ||
85 | .else | ||
86 | grep -q ' Protocol *: TLSv1.3$$' ${@:S/^check/client/}.out | 78 | grep -q ' Protocol *: TLSv1.3$$' ${@:S/^check/client/}.out |
87 | grep -q ' Protocol *: TLSv1.3$$' ${@:S/^check/server/}.out | 79 | grep -q ' Protocol *: TLSv1.3$$' ${@:S/^check/server/}.out |
88 | .endif | ||
89 | .else | 80 | .else |
90 | grep -q ' Protocol *: ${sver:S/TLS/TLSv/:S/_/./}$$' \ | 81 | grep -q ' Protocol *: ${sver:S/TLS/TLSv/:S/_/./}$$' \ |
91 | ${@:S/^check/client/}.out | 82 | ${@:S/^check/client/}.out |