summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-09-06 21:18:11 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-09-06 21:18:11 +1000
commit3ee50c5d9f95cd40df403cf1a91fdaffefa21cc5 (patch)
tree6278a023f595a9c1dc0b9a4a456d9e109d40a412
parent23e4b80a6085bddea80e2e64b4df99dd4931b1ea (diff)
- jmc@cvs.openbsd.org 2012/08/15 18:25:50
[ssh-keygen.1] a little more info on certificate validity; requested by Ross L Richardson, and provided by djm
-rw-r--r--ChangeLog7
-rw-r--r--ssh-keygen.18
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 048cefa57..3b6803b6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120120906
2 - (dtucker) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2012/08/15 18:25:50
4 [ssh-keygen.1]
5 a little more info on certificate validity;
6 requested by Ross L Richardson, and provided by djm
7
120120830 820120830
2 - (dtucker) [moduli] Import new moduli file. 9 - (dtucker) [moduli] Import new moduli file.
3 10
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 03f927edf..1d5564640 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.109 2012/07/06 00:41:59 dtucker Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.110 2012/08/15 18:25:50 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: July 6 2012 $ 38.Dd $Mdocdate: August 15 2012 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -628,7 +628,9 @@ The
628option allows specification of certificate start and end times. 628option allows specification of certificate start and end times.
629A certificate that is presented at a time outside this range will not be 629A certificate that is presented at a time outside this range will not be
630considered valid. 630considered valid.
631By default, certificates have a maximum validity interval. 631By default, certificates are valid from
632.Ux
633Epoch to the distant future.
632.Pp 634.Pp
633For certificates to be used for user or host authentication, the CA 635For certificates to be used for user or host authentication, the CA
634public key must be trusted by 636public key must be trusted by