From 55d2f7b047acdcbb4b0c6c6b9c65531476e72df5 Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 29 Aug 2021 15:52:47 +0000 Subject: [PATCH] Pass the -quiet option to openssl s_server to make it ignore EOF. This makes some tests run from the Makefile behave as they should. --- regress/usr.bin/openssl/x509/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/regress/usr.bin/openssl/x509/Makefile b/regress/usr.bin/openssl/x509/Makefile index 64767655960..e091b7b0d5e 100644 --- a/regress/usr.bin/openssl/x509/Makefile +++ b/regress/usr.bin/openssl/x509/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2021/08/29 13:17:42 tb Exp $ +# $OpenBSD: Makefile,v 1.7 2021/08/29 15:52:47 tb Exp $ # Copyright (c) 2021 Jan Klemkow # @@ -56,7 +56,7 @@ cleanup-ssl: test-inlabel-wildcard-cert-no-CA-client: # unusual wildcard cert, no CA given to client # start server - ${OPENSSL} s_server -naccept 1 -cert server-unusual-wildcard.pem \ + ${OPENSSL} s_server -quiet -naccept 1 -cert server-unusual-wildcard.pem \ -key server-unusual-wildcard.pem & \ timeout=$$(($$(date +%s) + 5)); \ while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ @@ -68,7 +68,7 @@ test-inlabel-wildcard-cert-no-CA-client: test-inlabel-wildcard-cert-CA-client: # unusual wildcard cert, CA given to client # start server - ${OPENSSL} s_server -naccept 1 -cert server-unusual-wildcard.pem \ + ${OPENSSL} s_server -quiet -naccept 1 -cert server-unusual-wildcard.pem \ -key server-unusual-wildcard.pem & \ timeout=$$(($$(date +%s) + 5)); \ while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ @@ -80,7 +80,7 @@ test-inlabel-wildcard-cert-CA-client: test-common-wildcard-cert-no-CA-client: # common wildcard cert, no CA given to client # start server - ${OPENSSL} s_server -naccept 1 -cert server-common-wildcard.pem \ + ${OPENSSL} s_server -quiet -naccept 1 -cert server-common-wildcard.pem \ -key server-common-wildcard.pem & \ timeout=$$(($$(date +%s) + 5)); \ while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ @@ -92,7 +92,7 @@ test-common-wildcard-cert-no-CA-client: test-common-wildcard-cert-CA-client: # common wildcard cert, CA given to client # start server - ${OPENSSL} s_server -naccept 1 -cert server-unusual-wildcard.pem \ + ${OPENSSL} s_server -quiet -naccept 1 -cert server-unusual-wildcard.pem \ -key server-unusual-wildcard.pem & \ timeout=$$(($$(date +%s) + 5)); \ while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ @@ -114,7 +114,7 @@ test-openssl-verify-common-wildcard-cert: test-chain-certificates-s_server: # Not all chain certificates are sent in s_server # start server - ${OPENSSL} s_server -naccept 1 -cert server-subca-chainS.pem -CAfile subcaR.pem & \ + ${OPENSSL} s_server -quiet -naccept 1 -cert server-subca-chainS.pem -CAfile subcaR.pem & \ timeout=$$(($$(date +%s) + 5)); \ while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ do test $$(date +%s) -lt $$timeout || exit 1; done -- 2.20.1