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 /auth-options.c | |
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
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c index 38211fa2a..b528c197a 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.77 2018/03/12 00:52:01 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.78 2018/03/14 05:35:40 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2018 Damien Miller <djm@mindrot.org> |
4 | * | 4 | * |
@@ -367,7 +367,7 @@ sshauthopt_parse(const char *opts, const char **errstrp) | |||
367 | &errstr); | 367 | &errstr); |
368 | if (ret->required_from_host_keys == NULL) | 368 | if (ret->required_from_host_keys == NULL) |
369 | goto fail; | 369 | goto fail; |
370 | } else if (opt_match(&opts, "valid-before")) { | 370 | } else if (opt_match(&opts, "expiry-time")) { |
371 | if ((opt = opt_dequote(&opts, &errstr)) == NULL) | 371 | if ((opt = opt_dequote(&opts, &errstr)) == NULL) |
372 | goto fail; | 372 | goto fail; |
373 | if (parse_absolute_time(opt, &valid_before) != 0 || | 373 | if (parse_absolute_time(opt, &valid_before) != 0 || |