diff options
-rw-r--r-- | src/regress/lib/libssl/interop/cert/Makefile | 5 | ||||
-rw-r--r-- | src/regress/lib/libssl/interop/netcat/Makefile | 5 | ||||
-rw-r--r-- | src/regress/lib/libssl/interop/session/Makefile | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/regress/lib/libssl/interop/cert/Makefile b/src/regress/lib/libssl/interop/cert/Makefile index 911fe8c325..3e7a07cdfe 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.2 2018/11/11 00:15:04 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.3 2018/11/11 07:39:34 bluhm Exp $ |
2 | 2 | ||
3 | LIBRARIES = libressl | 3 | LIBRARIES = libressl |
4 | .if exists(/usr/local/bin/eopenssl) | 4 | .if exists(/usr/local/bin/eopenssl) |
@@ -50,7 +50,8 @@ run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${s | |||
50 | ${cv:S/^noverify//:S/^verify/-v/} \ | 50 | ${cv:S/^noverify//:S/^verify/-v/} \ |
51 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` | 51 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` |
52 | .if empty(${FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv}}) | 52 | .if empty(${FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv}}) |
53 | grep '^success$$' ${@:S/^run/server/}.out | 53 | grep '^success$$' ${@:S/^run/server/}.out || \ |
54 | { sleep 1; grep '^success$$' ${@:S/^run/server/}.out; } | ||
54 | grep '^success$$' ${@:S/^run/client/}.out | 55 | grep '^success$$' ${@:S/^run/client/}.out |
55 | .elif ! ("${sv}" == certverify && "${ccert}" == nocert) || \ | 56 | .elif ! ("${sv}" == certverify && "${ccert}" == nocert) || \ |
56 | ("${cv}" == verify && "${scert}" != cert) | 57 | ("${cv}" == verify && "${scert}" != cert) |
diff --git a/src/regress/lib/libssl/interop/netcat/Makefile b/src/regress/lib/libssl/interop/netcat/Makefile index def90c1ffb..80f49c52f0 100644 --- a/src/regress/lib/libssl/interop/netcat/Makefile +++ b/src/regress/lib/libssl/interop/netcat/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.1 2018/11/11 00:15:04 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.2 2018/11/11 07:39:35 bluhm Exp $ |
2 | 2 | ||
3 | LIBRARIES = libressl | 3 | LIBRARIES = libressl |
4 | .if exists(/usr/local/bin/eopenssl) | 4 | .if exists(/usr/local/bin/eopenssl) |
@@ -52,7 +52,8 @@ run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt | |||
52 | -c -R 127.0.0.1.crt \ | 52 | -c -R 127.0.0.1.crt \ |
53 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` | 53 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` |
54 | # check that the server child run successfully to the end | 54 | # check that the server child run successfully to the end |
55 | grep -q '^success$$' ${@:S/^run/server/}.out | 55 | grep -q '^success$$' ${@:S/^run/server/}.out || \ |
56 | { sleep 1; grep -q '^success$$' ${@:S/^run/server/}.out; } | ||
56 | # server must have read client hello | 57 | # server must have read client hello |
57 | grep -q '^<<< hello$$' ${@:S/^run/server/}.out | 58 | grep -q '^<<< hello$$' ${@:S/^run/server/}.out |
58 | # client must have read server greeting | 59 | # client must have read server greeting |
diff --git a/src/regress/lib/libssl/interop/session/Makefile b/src/regress/lib/libssl/interop/session/Makefile index 072fa1b93c..c82440d785 100644 --- a/src/regress/lib/libssl/interop/session/Makefile +++ b/src/regress/lib/libssl/interop/session/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.2 2018/11/11 00:15:04 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.3 2018/11/11 07:39:35 bluhm Exp $ |
2 | 2 | ||
3 | LIBRARIES = libressl | 3 | LIBRARIES = libressl |
4 | .if exists(/usr/local/bin/eopenssl) | 4 | .if exists(/usr/local/bin/eopenssl) |
@@ -29,7 +29,8 @@ run-session-client-${clib}-server-${slib}: \ | |||
29 | ../${clib}/client >${@:S/^run/client/}.out \ | 29 | ../${clib}/client >${@:S/^run/client/}.out \ |
30 | -ss \ | 30 | -ss \ |
31 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` | 31 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` |
32 | grep '^success$$' ${@:S/^run/server/}.out | 32 | grep '^success$$' ${@:S/^run/server/}.out || \ |
33 | { sleep 1; grep '^success$$' ${@:S/^run/server/}.out; } | ||
33 | grep '^success$$' ${@:S/^run/client/}.out | 34 | grep '^success$$' ${@:S/^run/client/}.out |
34 | grep '^session 2: new$$' ${@:S/^run/server/}.out | 35 | grep '^session 2: new$$' ${@:S/^run/server/}.out |
35 | grep '^session 2: new$$' ${@:S/^run/client/}.out | 36 | grep '^session 2: new$$' ${@:S/^run/client/}.out |