summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh-keygen.113
-rw-r--r--ssh-keyscan.19
2 files changed, 8 insertions, 14 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index ee90e7e3f..624995617 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.138 2017/05/02 09:05:58 jmc Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.139 2017/05/02 17:04:09 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
@@ -46,7 +46,7 @@
46.Nm ssh-keygen 46.Nm ssh-keygen
47.Op Fl q 47.Op Fl q
48.Op Fl b Ar bits 48.Op Fl b Ar bits
49.Op Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 49.Op Fl t Cm dsa | ecdsa | ed25519 | rsa
50.Op Fl N Ar new_passphrase 50.Op Fl N Ar new_passphrase
51.Op Fl C Ar comment 51.Op Fl C Ar comment
52.Op Fl f Ar output_keyfile 52.Op Fl f Ar output_keyfile
@@ -223,7 +223,7 @@ should be placed to be activated.
223The options are as follows: 223The options are as follows:
224.Bl -tag -width Ds 224.Bl -tag -width Ds
225.It Fl A 225.It Fl A
226For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) 226For each of the key types (rsa, dsa, ecdsa and ed25519)
227for which host keys 227for which host keys
228do not exist, generate the host keys with the default key file path, 228do not exist, generate the host keys with the default key file path,
229an empty passphrase, default bits for the key type, and default comment. 229an empty passphrase, default bits for the key type, and default comment.
@@ -557,17 +557,14 @@ section for details.
557Test DH group exchange candidate primes (generated using the 557Test DH group exchange candidate primes (generated using the
558.Fl G 558.Fl G
559option) for safety. 559option) for safety.
560.It Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 560.It Fl t Cm dsa | ecdsa | ed25519 | rsa
561Specifies the type of key to create. 561Specifies the type of key to create.
562The possible values are 562The possible values are
563.Dq rsa1
564for protocol version 1 and
565.Dq dsa , 563.Dq dsa ,
566.Dq ecdsa , 564.Dq ecdsa ,
567.Dq ed25519 , 565.Dq ed25519 ,
568or 566or
569.Dq rsa 567.Dq rsa .
570for protocol version 2.
571.It Fl u 568.It Fl u
572Update a KRL. 569Update a KRL.
573When specified with 570When specified with
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 82bcb5d01..aa4a2ae83 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.39 2017/04/30 23:18:44 djm Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.40 2017/05/02 17:04:09 jmc Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -6,7 +6,7 @@
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project by leaving this copyright notice intact. 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" 8.\"
9.Dd $Mdocdate: April 30 2017 $ 9.Dd $Mdocdate: May 2 2017 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -90,14 +90,11 @@ Default is 5 seconds.
90.It Fl t Ar type 90.It Fl t Ar type
91Specifies the type of the key to fetch from the scanned hosts. 91Specifies the type of the key to fetch from the scanned hosts.
92The possible values are 92The possible values are
93.Dq rsa1
94for protocol version 1 and
95.Dq dsa , 93.Dq dsa ,
96.Dq ecdsa , 94.Dq ecdsa ,
97.Dq ed25519 , 95.Dq ed25519 ,
98or 96or
99.Dq rsa 97.Dq rsa .
100for protocol version 2.
101Multiple values may be specified by separating them with commas. 98Multiple values may be specified by separating them with commas.
102The default is to fetch 99The default is to fetch
103.Dq rsa , 100.Dq rsa ,