- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / ssh-keygen.1

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 59e12b5435a088f2c1f2b5e98407feb29beaf172..190124e16bf68319678a8566a596ce071075163c 100644 (file)
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keygen.1,v 1.77 2008/06/11 22:20:46 grunk Exp $
+.\"    $OpenBSD: ssh-keygen.1,v 1.80 2009/10/24 00:48:34 dtucker Exp $

 .\"
 .\"  -*- nroff -*-
 .\"
 .\"
 .\"  -*- nroff -*-
 .\"


@@ -83,6 +83,7 @@
 .Nm ssh-keygen
 .Fl F Ar hostname
 .Op Fl f Ar known_hosts_file
 .Nm ssh-keygen
 .Fl F Ar hostname
 .Op Fl f Ar known_hosts_file

+.Op Fl l

 .Nm ssh-keygen
 .Fl H
 .Op Fl f Ar known_hosts_file
 .Nm ssh-keygen
 .Fl H
 .Op Fl f Ar known_hosts_file


@@ -258,14 +259,13 @@ This option allows importing keys from several commercial
 SSH implementations.
 .It Fl l
 Show fingerprint of specified public key file.
 SSH implementations.
 .It Fl l
 Show fingerprint of specified public key file.

-If invoked along with
-.Fl v ,
-an ASCII art representation of the key is supplied with the fingerprint.

 Private RSA1 keys are also supported.
 For RSA and DSA keys
 .Nm
 Private RSA1 keys are also supported.
 For RSA and DSA keys
 .Nm

-tries to find the matching public key file and prints its fingerprint
-and representation.
+tries to find the matching public key file and prints its fingerprint.
+If combined with
+.Fl v ,
+an ASCII art representation of the key is supplied with the fingerprint.

 .It Fl M Ar memory
 Specify the amount of memory to use (in megabytes) when generating
 candidate moduli for DH-GEX.
 .It Fl M Ar memory
 Specify the amount of memory to use (in megabytes) when generating
 candidate moduli for DH-GEX.


@@ -393,7 +393,7 @@ Contains the protocol version 1 RSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be

-used to encrypt the private part of this file using 3DES.
+used to encrypt the private part of this file using 128-bit AES.

 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.
 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.


@@ -411,7 +411,7 @@ Contains the protocol version 2 DSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be

-used to encrypt the private part of this file using 3DES.
+used to encrypt the private part of this file using 128-bit AES.

 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.
 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.


@@ -429,7 +429,7 @@ Contains the protocol version 2 RSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be

-used to encrypt the private part of this file using 3DES.
+used to encrypt the private part of this file using 128-bit AES.

 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.
 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.