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:33 +1100 |
| commit | abc0fa38c9bc136871f28e452c3465c3051fc785 (patch) | |
| tree | 69e7e2628aba30169497d0a031bcfe1374f83c64 | |
| parent | bf0fbf2b11a44f06a64b620af7d01ff171c28e13 (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-Commit-ID: 376939466a1f562f3950a22314bc6505733aaae6
| -rw-r--r-- | auth-options.c | 4 | ||||
| -rw-r--r-- | sshd.8 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/auth-options.c b/auth-options.c index 38211fa2..b528c197 100644 --- a/auth-options.c +++ b/auth-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.77 2018/03/12 00:52:01 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.78 2018/03/14 05:35:40 djm Exp $ */ /* * Copyright (c) 2018 Damien Miller <djm@mindrot.org> * @@ -367,7 +367,7 @@ sshauthopt_parse(const char *opts, const char **errstrp) &errstr); if (ret->required_from_host_keys == NULL) goto fail; - } else if (opt_match(&opts, "valid-before")) { + } else if (opt_match(&opts, "expiry-time")) { if ((opt = opt_dequote(&opts, &errstr)) == NULL) goto fail; if (parse_absolute_time(opt, &valid_before) != 0 || @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.297 2018/03/12 00:52:01 djm Exp $ -.Dd $Mdocdate: March 12 2018 $ +.\" $OpenBSD: sshd.8,v 1.298 2018/03/14 05:35:40 djm Exp $ +.Dd $Mdocdate: March 14 2018 $ .Dt SSHD 8 .Os .Sh NAME @@ -602,7 +602,7 @@ Enables execution of previously disabled by the .Cm restrict option. -.It Cm valid-before="timespec" +.It Cm expiry-time="timespec" Specifies a time after which the key will not be accepted. The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time in the system time-zone. |