summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 85cc3ec66..a4af4e897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,11 @@
22 - djm@cvs.openbsd.org 2013/10/23 03:05:19 22 - djm@cvs.openbsd.org 2013/10/23 03:05:19
23 [readconf.c ssh.c] 23 [readconf.c ssh.c]
24 comment 24 comment
25 - djm@cvs.openbsd.org 2013/10/23 04:16:22
26 [ssh-keygen.c]
27 Make code match documentation: relative-specified certificate expiry time
28 should be relative to current time and not the validity start time.
29 Reported by Petr Lautrbach; ok deraadt@
25 30
2620131018 3120131018
27 - (djm) OpenBSD CVS Sync 32 - (djm) OpenBSD CVS Sync
diff --git a/ssh-keygen.c b/ssh-keygen.c
index b8d55452d..b664a5f1f 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.234 2013/09/02 22:00:34 deraadt Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.235 2013/10/23 04:16:22 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1743,7 +1743,7 @@ parse_cert_times(char *timespec)
1743 cert_valid_from = parse_absolute_time(from); 1743 cert_valid_from = parse_absolute_time(from);
1744 1744
1745 if (*to == '-' || *to == '+') 1745 if (*to == '-' || *to == '+')
1746 cert_valid_to = parse_relative_time(to, cert_valid_from); 1746 cert_valid_to = parse_relative_time(to, now);
1747 else 1747 else
1748 cert_valid_to = parse_absolute_time(to); 1748 cert_valid_to = parse_absolute_time(to);
1749 1749