summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2021-08-30 09:06:04 +0000
committerbeck <>2021-08-30 09:06:04 +0000
commitb065d46fe0a0fbd0ab234a272db04cbcc1e40b4f (patch)
tree999925b63d7e5329cf0d3e29a8252450df26cca6 /src
parent8358ac074bd99c2b6335901e7f51b4a82c50dc96 (diff)
downloadopenbsd-b065d46fe0a0fbd0ab234a272db04cbcc1e40b4f.tar.gz
openbsd-b065d46fe0a0fbd0ab234a272db04cbcc1e40b4f.tar.bz2
openbsd-b065d46fe0a0fbd0ab234a272db04cbcc1e40b4f.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/regress/usr.bin/openssl/x509/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/regress/usr.bin/openssl/x509/Makefile b/src/regress/usr.bin/openssl/x509/Makefile
index b022974dcb..69488994af 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.8 2021/08/30 06:51:36 beck Exp $ 1# $OpenBSD: Makefile,v 1.9 2021/08/30 09:06:04 beck 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#
@@ -57,9 +57,9 @@ test-inlabel-wildcard-cert-no-CA-client:
57 timeout=$$(($$(date +%s) + 5)); \ 57 timeout=$$(($$(date +%s) + 5)); \
58 while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ 58 while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \
59 do test $$(date +%s) -lt $$timeout || exit 1; done 59 do test $$(date +%s) -lt $$timeout || exit 1; done
60 # start client 60 # start client, note - some versions of openssl return 21.
61 echo Q | ${OPENSSL} s_client -verify_return_error \ 61 echo Q | ${OPENSSL} s_client -verify_return_error \
62 | grep "Verify return code: 21" 62 | grep "Verify return code: 20"
63 63
64test-inlabel-wildcard-cert-CA-client: 64test-inlabel-wildcard-cert-CA-client:
65 # unusual wildcard cert, CA given to client 65 # unusual wildcard cert, CA given to client
@@ -81,9 +81,9 @@ test-common-wildcard-cert-no-CA-client:
81 timeout=$$(($$(date +%s) + 5)); \ 81 timeout=$$(($$(date +%s) + 5)); \
82 while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \ 82 while fstat -p $$! | ! grep -q 'tcp .* \*:4433$$'; \
83 do test $$(date +%s) -lt $$timeout || exit 1; done 83 do test $$(date +%s) -lt $$timeout || exit 1; done
84 # start client 84 # start client, note - some versions of openssl return 21.
85 echo Q | ${OPENSSL} s_client \ 85 echo Q | ${OPENSSL} s_client \
86 | grep "Verify return code: 21" 86 | grep "Verify return code: 20"
87 87
88test-common-wildcard-cert-CA-client: 88test-common-wildcard-cert-CA-client:
89 # common wildcard cert, CA given to client 89 # common wildcard cert, CA given to client