summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-03 03:02:26 +0000
committerColin Watson <cjwatson@debian.org>2020-01-09 11:40:11 +0000
commitdf3ad29af495185aa9b051028ae94b965a4b1659 (patch)
tree5aa61ffdea1db260f5fe70e5361bff3243812b66
parentcfa01c635debb10e05f5ac34d269809c77c582dc (diff)
upstream: what bozo decided to use 2020 as a future date in a regress
test? OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=ff31f15773ee173502eec4d7861ec56f26bba381 Last-Update: 2020-01-09 Patch-Name: regress-2020.patch
-rw-r--r--regress/cert-hostkey.sh2
-rw-r--r--regress/cert-userkey.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 86ea62504..844adabcc 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -252,7 +252,7 @@ test_one() {
252test_one "user-certificate" failure "-n $HOSTS" 252test_one "user-certificate" failure "-n $HOSTS"
253test_one "empty principals" success "-h" 253test_one "empty principals" success "-h"
254test_one "wrong principals" failure "-h -n foo" 254test_one "wrong principals" failure "-h -n foo"
255test_one "cert not yet valid" failure "-h -V20200101:20300101" 255test_one "cert not yet valid" failure "-h -V20300101:20320101"
256test_one "cert expired" failure "-h -V19800101:19900101" 256test_one "cert expired" failure "-h -V19800101:19900101"
257test_one "cert valid interval" success "-h -V-1w:+2w" 257test_one "cert valid interval" success "-h -V-1w:+2w"
258test_one "cert has constraints" failure "-h -Oforce-command=false" 258test_one "cert has constraints" failure "-h -Oforce-command=false"
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 38c14a698..5cd02fc3f 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -338,7 +338,7 @@ test_one() {
338test_one "correct principal" success "-n ${USER}" 338test_one "correct principal" success "-n ${USER}"
339test_one "host-certificate" failure "-n ${USER} -h" 339test_one "host-certificate" failure "-n ${USER} -h"
340test_one "wrong principals" failure "-n foo" 340test_one "wrong principals" failure "-n foo"
341test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" 341test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101"
342test_one "cert expired" failure "-n ${USER} -V19800101:19900101" 342test_one "cert expired" failure "-n ${USER} -V19800101:19900101"
343test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" 343test_one "cert valid interval" success "-n ${USER} -V-1w:+2w"
344test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" 344test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8"