tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: rename recently-added "valid-before" key restriction to

Browse Source 
"expiry-time" as the former is confusing wrt similar terminology in X.509;
pointed out by jsing@

OpenBSD-Commit-ID: 376939466a1f562f3950a22314bc6505733aaae6
This commit is contained in:
djm@openbsd.org 2018-03-14 05:35:40 +00:00 committed by Damien Miller
parent bf0fbf2b11
commit abc0fa38c9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth-options.c
View File

@ -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> * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
* *
@ -367,7 +367,7 @@ sshauthopt_parse(const char *opts, const char **errstrp)
&errstr); &errstr);
if (ret->required_from_host_keys == NULL) if (ret->required_from_host_keys == NULL)
goto fail; goto fail;
} else if (opt_match(&opts, "valid-before")) { } else if (opt_match(&opts, "expiry-time")) {
if ((opt = opt_dequote(&opts, &errstr)) == NULL) if ((opt = opt_dequote(&opts, &errstr)) == NULL)
goto fail; goto fail;
if (parse_absolute_time(opt, &valid_before) != 0 || if (parse_absolute_time(opt, &valid_before) != 0 ||

6
sshd.8
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: sshd.8,v 1.298 2018/03/14 05:35:40 djm Exp $
.Dd $Mdocdate: March 12 2018 $ .Dd $Mdocdate: March 14 2018 $
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
.Sh NAME .Sh NAME
@ -602,7 +602,7 @@ Enables execution of
previously disabled by the previously disabled by the
.Cm restrict .Cm restrict
option. option.
.It Cm valid-before="timespec" .It Cm expiry-time="timespec"
Specifies a time after which the key will not be accepted. 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 The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time
in the system time-zone. in the system time-zone.