diff options
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index a71de7481..79b948c8b 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.120 2014/02/05 20:13:25 naddy Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.122 2014/03/31 13:39:34 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: February 5 2014 $ | 38 | .Dd $Mdocdate: March 31 2014 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -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 Ar type | 49 | .Op Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 |
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 |
@@ -328,6 +328,10 @@ in the format specified by the | |||
328 | .Fl m | 328 | .Fl m |
329 | option and print an OpenSSH compatible private | 329 | option and print an OpenSSH compatible private |
330 | (or public) key to stdout. | 330 | (or public) key to stdout. |
331 | This option allows importing keys from other software, including several | ||
332 | commercial SSH implementations. | ||
333 | The default import format is | ||
334 | .Dq RFC4716 . | ||
331 | .It Fl J Ar num_lines | 335 | .It Fl J Ar num_lines |
332 | Exit after screening the specified number of lines | 336 | Exit after screening the specified number of lines |
333 | while performing DH candidate screening using the | 337 | while performing DH candidate screening using the |
@@ -346,10 +350,6 @@ while performing DH candidate screening using the | |||
346 | option. | 350 | option. |
347 | This will be used to skip lines in the input file that have already been | 351 | This will be used to skip lines in the input file that have already been |
348 | processed if the job is restarted. | 352 | processed if the job is restarted. |
349 | This option allows importing keys from other software, including several | ||
350 | commercial SSH implementations. | ||
351 | The default import format is | ||
352 | .Dq RFC4716 . | ||
353 | .It Fl k | 353 | .It Fl k |
354 | Generate a KRL file. | 354 | Generate a KRL file. |
355 | In this mode, | 355 | In this mode, |
@@ -510,7 +510,7 @@ section for details. | |||
510 | Test DH group exchange candidate primes (generated using the | 510 | Test DH group exchange candidate primes (generated using the |
511 | .Fl G | 511 | .Fl G |
512 | option) for safety. | 512 | option) for safety. |
513 | .It Fl t Ar type | 513 | .It Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 |
514 | Specifies the type of key to create. | 514 | Specifies the type of key to create. |
515 | The possible values are | 515 | The possible values are |
516 | .Dq rsa1 | 516 | .Dq rsa1 |