summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-03-14 05:35:40 +0000
committerDamien Miller <djm@mindrot.org>2018-03-14 18:55:47 +1100
commit4c4e7f783b43b264c247233acb887ee10ed4ce4d (patch)
treea05e44dbbccab72df944c2330b8af9dbf47779d4
parent500396b204c58e78ad9d081516a365a9f28dc3fd (diff)
upstream: rename recently-added "valid-before" key restriction to
"expiry-time" as the former is confusing wrt similar terminology in X.509; pointed out by jsing@ OpenBSD-Regress-ID: ac8b41dbfd90cffd525d58350c327195b0937793
-rw-r--r--regress/key-options.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh
index 991849949..e03cae585 100644
--- a/regress/key-options.sh
+++ b/regress/key-options.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: key-options.sh,v 1.7 2018/03/12 00:56:03 djm Exp $ 1# $OpenBSD: key-options.sh,v 1.8 2018/03/14 05:35:40 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="key options" 4tid="key options"
@@ -99,7 +99,7 @@ check_valid_before() {
99 opts=$2 99 opts=$2
100 expect=$3 100 expect=$3
101 sed "s/.*/$opts &/" $origkeys >$authkeys 101 sed "s/.*/$opts &/" $origkeys >$authkeys
102 verbose "key option valid-before $which" 102 verbose "key option expiry-time $which"
103 ${SSH} -q -F $OBJ/ssh_proxy somehost true 103 ${SSH} -q -F $OBJ/ssh_proxy somehost true
104 case "$expect" in 104 case "$expect" in
105 fail) test $? -eq 0 && fail "key option succeeded $which" ;; 105 fail) test $? -eq 0 && fail "key option succeeded $which" ;;
@@ -108,7 +108,7 @@ check_valid_before() {
108 esac 108 esac
109} 109}
110check_valid_before "default" "" "pass" 110check_valid_before "default" "" "pass"
111check_valid_before "invalid" 'valid-before="INVALID"' "fail" 111check_valid_before "invalid" 'expiry-time="INVALID"' "fail"
112check_valid_before "expired" 'valid-before="19990101"' "fail" 112check_valid_before "expired" 'expiry-time="19990101"' "fail"
113check_valid_before "valid" 'valid-before="20380101"' "pass" 113check_valid_before "valid" 'expiry-time="20380101"' "pass"
114 114