diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-03-14 05:35:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-03-14 18:55:47 +1100 |
commit | 4c4e7f783b43b264c247233acb887ee10ed4ce4d (patch) | |
tree | a05e44dbbccab72df944c2330b8af9dbf47779d4 | |
parent | 500396b204c58e78ad9d081516a365a9f28dc3fd (diff) | |
download | openssh-git-4c4e7f783b43b264c247233acb887ee10ed4ce4d.tar.gz |
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.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/key-options.sh b/regress/key-options.sh index 99184994..e03cae58 100644 --- a/regress/key-options.sh +++ b/regress/key-options.sh @@ -1,4 +1,4 @@ -# $OpenBSD: key-options.sh,v 1.7 2018/03/12 00:56:03 djm Exp $ +# $OpenBSD: key-options.sh,v 1.8 2018/03/14 05:35:40 djm Exp $ # Placed in the Public Domain. tid="key options" @@ -99,7 +99,7 @@ check_valid_before() { opts=$2 expect=$3 sed "s/.*/$opts &/" $origkeys >$authkeys - verbose "key option valid-before $which" + verbose "key option expiry-time $which" ${SSH} -q -F $OBJ/ssh_proxy somehost true case "$expect" in fail) test $? -eq 0 && fail "key option succeeded $which" ;; @@ -108,7 +108,7 @@ check_valid_before() { esac } check_valid_before "default" "" "pass" -check_valid_before "invalid" 'valid-before="INVALID"' "fail" -check_valid_before "expired" 'valid-before="19990101"' "fail" -check_valid_before "valid" 'valid-before="20380101"' "pass" +check_valid_before "invalid" 'expiry-time="INVALID"' "fail" +check_valid_before "expired" 'expiry-time="19990101"' "fail" +check_valid_before "valid" 'expiry-time="20380101"' "pass" |