From e0c2d897b0129c94326b52a6000f35dc5458eee7 Mon Sep 17 00:00:00 2001 From: beck <> Date: Mon, 30 Aug 2021 06:51:36 +0000 Subject: Fix Jan's regress in openssl/x509 to do what it says it does, then fix the only thing it still has complaints about which is that we don't return the leaf version of the error code when we can't verify the leaf (as opposed to the rest of the chain) ok jan@ tb@ --- src/regress/usr.bin/openssl/x509/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/regress/usr.bin/openssl') diff --git a/src/regress/usr.bin/openssl/x509/Makefile b/src/regress/usr.bin/openssl/x509/Makefile index e091b7b0d5..b022974dcb 100644 --- a/src/regress/usr.bin/openssl/x509/Makefile +++ b/src/regress/usr.bin/openssl/x509/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2021/08/29 15:52:47 tb Exp $ +# $OpenBSD: Makefile,v 1.8 2021/08/30 06:51:36 beck Exp $ # Copyright (c) 2021 Jan Klemkow # @@ -42,10 +42,6 @@ REGRESS_TARGETS += test-alternative-chain REGRESS_CLEANUP = cleanup-ssl REGRESS_SETUP_ONCE = create-libressl-test-certs -REGRESS_EXPECTED_FAILURES += test-inlabel-wildcard-cert-no-CA-client -REGRESS_EXPECTED_FAILURES += test-unusual-wildcard-cert-no-CA-client -REGRESS_EXPECTED_FAILURES += test-common-wildcard-cert-no-CA-client -REGRESS_EXPECTED_FAILURES += test-common-wildcard-cert-CA-client create-libressl-test-certs: create-libressl-test-certs.pl ${PERL} ${.CURDIR}/$@.pl @@ -92,14 +88,14 @@ 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 -quiet -naccept 1 -cert server-unusual-wildcard.pem \ - -key server-unusual-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$$'; \ do test $$(date +%s) -lt $$timeout || exit 1; done # start client echo Q | ${OPENSSL} s_client -CAfile caR.pem \ - | grep "Verify return code: 21" + | grep "Verify return code: 0" test-verify-unusual-wildcard-cert: # openssl verify, unusual wildcard cert -- cgit v1.2.3-55-g6feb