diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/regress/usr.bin/openssl/x509/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/regress/usr.bin/openssl/x509/Makefile b/src/regress/usr.bin/openssl/x509/Makefile index 6476765596..e091b7b0d5 100644 --- a/src/regress/usr.bin/openssl/x509/Makefile +++ b/src/regress/usr.bin/openssl/x509/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.6 2021/08/29 13:17:42 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.7 2021/08/29 15:52:47 tb Exp $ |
| 2 | 2 | ||
| 3 | # Copyright (c) 2021 Jan Klemkow <j.klemkow@wemelug.de> | 3 | # Copyright (c) 2021 Jan Klemkow <j.klemkow@wemelug.de> |
| 4 | # | 4 | # |
| @@ -56,7 +56,7 @@ cleanup-ssl: | |||
| 56 | test-inlabel-wildcard-cert-no-CA-client: | 56 | test-inlabel-wildcard-cert-no-CA-client: |
| 57 | # unusual wildcard cert, no CA given to client | 57 | # unusual wildcard cert, no CA given to client |
| 58 | # start server | 58 | # start server |
| 59 | ${OPENSSL} s_server -naccept 1 -cert server-unusual-wildcard.pem \ | 59 | ${OPENSSL} s_server -quiet -naccept 1 -cert server-unusual-wildcard.pem \ |
| 60 | -key server-unusual-wildcard.pem & \ | 60 | -key server-unusual-wildcard.pem & \ |
| 61 | timeout=$$(($$(date +%s) + 5)); \ | 61 | timeout=$$(($$(date +%s) + 5)); \ |
| 62 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ | 62 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ |
| @@ -68,7 +68,7 @@ test-inlabel-wildcard-cert-no-CA-client: | |||
| 68 | test-inlabel-wildcard-cert-CA-client: | 68 | test-inlabel-wildcard-cert-CA-client: |
| 69 | # unusual wildcard cert, CA given to client | 69 | # unusual wildcard cert, CA given to client |
| 70 | # start server | 70 | # start server |
| 71 | ${OPENSSL} s_server -naccept 1 -cert server-unusual-wildcard.pem \ | 71 | ${OPENSSL} s_server -quiet -naccept 1 -cert server-unusual-wildcard.pem \ |
| 72 | -key server-unusual-wildcard.pem & \ | 72 | -key server-unusual-wildcard.pem & \ |
| 73 | timeout=$$(($$(date +%s) + 5)); \ | 73 | timeout=$$(($$(date +%s) + 5)); \ |
| 74 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ | 74 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ |
| @@ -80,7 +80,7 @@ test-inlabel-wildcard-cert-CA-client: | |||
| 80 | test-common-wildcard-cert-no-CA-client: | 80 | test-common-wildcard-cert-no-CA-client: |
| 81 | # common wildcard cert, no CA given to client | 81 | # common wildcard cert, no CA given to client |
| 82 | # start server | 82 | # start server |
| 83 | ${OPENSSL} s_server -naccept 1 -cert server-common-wildcard.pem \ | 83 | ${OPENSSL} s_server -quiet -naccept 1 -cert server-common-wildcard.pem \ |
| 84 | -key server-common-wildcard.pem & \ | 84 | -key server-common-wildcard.pem & \ |
| 85 | timeout=$$(($$(date +%s) + 5)); \ | 85 | timeout=$$(($$(date +%s) + 5)); \ |
| 86 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ | 86 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ |
| @@ -92,7 +92,7 @@ test-common-wildcard-cert-no-CA-client: | |||
| 92 | test-common-wildcard-cert-CA-client: | 92 | test-common-wildcard-cert-CA-client: |
| 93 | # common wildcard cert, CA given to client | 93 | # common wildcard cert, CA given to client |
| 94 | # start server | 94 | # start server |
| 95 | ${OPENSSL} s_server -naccept 1 -cert server-unusual-wildcard.pem \ | 95 | ${OPENSSL} s_server -quiet -naccept 1 -cert server-unusual-wildcard.pem \ |
| 96 | -key server-unusual-wildcard.pem & \ | 96 | -key server-unusual-wildcard.pem & \ |
| 97 | timeout=$$(($$(date +%s) + 5)); \ | 97 | timeout=$$(($$(date +%s) + 5)); \ |
| 98 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ | 98 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ |
| @@ -114,7 +114,7 @@ test-openssl-verify-common-wildcard-cert: | |||
| 114 | test-chain-certificates-s_server: | 114 | test-chain-certificates-s_server: |
| 115 | # Not all chain certificates are sent in s_server | 115 | # Not all chain certificates are sent in s_server |
| 116 | # start server | 116 | # start server |
| 117 | ${OPENSSL} s_server -naccept 1 -cert server-subca-chainS.pem -CAfile subcaR.pem & \ | 117 | ${OPENSSL} s_server -quiet -naccept 1 -cert server-subca-chainS.pem -CAfile subcaR.pem & \ |
| 118 | timeout=$$(($$(date +%s) + 5)); \ | 118 | timeout=$$(($$(date +%s) + 5)); \ |
| 119 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ | 119 | while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ |
| 120 | do test $$(date +%s) -lt $$timeout || exit 1; done | 120 | do test $$(date +%s) -lt $$timeout || exit 1; done |