summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2021-08-30 09:06:05 +0000
committerBob Beck <beck@cvs.openbsd.org>2021-08-30 09:06:05 +0000
commit6affb93da8f32f498ed3429800089e7660fe035a (patch)
treebc0d2ba933805289269c4865f6975d5ca14f9bb4
parentfefc3c77919a1322e174071c651df764ca925f71 (diff)
Admit that we return error 20 in the failure case here. Changing
our verifier to return 21 results in other regress failures in ruby and perl.
-rw-r--r--regress/usr.bin/openssl/x509/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/usr.bin/openssl/x509/Makefile b/regress/usr.bin/openssl/x509/Makefile
index b022974dcb7..69488994afb 100644
--- a/regress/usr.bin/openssl/x509/Makefile
+++ b/regress/usr.bin/openssl/x509/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2021/08/30 06:51:36 beck Exp $
+# $OpenBSD: Makefile,v 1.9 2021/08/30 09:06:04 beck Exp $
# Copyright (c) 2021 Jan Klemkow <j.klemkow@wemelug.de>
#
@@ -57,9 +57,9 @@ test-inlabel-wildcard-cert-no-CA-client:
timeout=$$(($$(date +%s) + 5)); \
while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \
do test $$(date +%s) -lt $$timeout || exit 1; done
- # start client
+ # start client, note - some versions of openssl return 21.
echo Q | ${OPENSSL} s_client -verify_return_error \
- | grep "Verify return code: 21"
+ | grep "Verify return code: 20"
test-inlabel-wildcard-cert-CA-client:
# unusual wildcard cert, CA given to client
@@ -81,9 +81,9 @@ test-common-wildcard-cert-no-CA-client:
timeout=$$(($$(date +%s) + 5)); \
while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \
do test $$(date +%s) -lt $$timeout || exit 1; done
- # start client
+ # start client, note - some versions of openssl return 21.
echo Q | ${OPENSSL} s_client \
- | grep "Verify return code: 21"
+ | grep "Verify return code: 20"
test-common-wildcard-cert-CA-client:
# common wildcard cert, CA given to client