- 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 ab16bcd77731f6405a400579f6da4e341d5d4ff5..190124e16bf68319678a8566a596ce071075163c 100644 (file)
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keygen.1,v 1.72 2005/11/28 05:16:53 dtucker Exp $
+.\"    $OpenBSD: ssh-keygen.1,v 1.80 2009/10/24 00:48:34 dtucker Exp $

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


@@ -37,7 +37,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"

-.Dd September 25, 1999
+.Dd $Mdocdate$

 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME


@@ -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


@@ -205,8 +206,8 @@ Download the RSA public key stored in the smartcard in
 .Ar reader .
 .It Fl e
 This option will read a private or public OpenSSH key file and
 .Ar reader .
 .It Fl e
 This option will read a private or public OpenSSH key file and

-print the key in a
-.Sq SECSH Public Key File Format
+print the key in
+RFC 4716 SSH Public Key File Format

 to stdout.
 This option allows exporting keys for use by several commercial
 SSH implementations.
 to stdout.
 This option allows exporting keys for use by several commercial
 SSH implementations.


@@ -253,7 +254,7 @@ in SSH2-compatible format and print an OpenSSH compatible private
 (or public) key to stdout.
 .Nm
 also reads the
 (or public) key to stdout.
 .Nm
 also reads the

-.Sq SECSH Public Key File Format .
+RFC 4716 SSH Public Key File Format.

 This option allows importing keys from several commercial
 SSH implementations.
 .It Fl l
 This option allows importing keys from several commercial
 SSH implementations.
 .It Fl l


@@ -262,6 +263,9 @@ Private RSA1 keys are also supported.
 For RSA and DSA keys
 .Nm
 tries to find the matching public key file and prints its fingerprint.
 For RSA and DSA keys
 .Nm
 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.


@@ -389,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.


@@ -407,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.


@@ -425,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.


@@ -450,12 +454,9 @@ The file format is described in
 .Xr moduli 5 ,
 .Xr sshd 8
 .Rs
 .Xr moduli 5 ,
 .Xr sshd 8
 .Rs

-.%A J. Galbraith
-.%A R. Thayer
-.%T "SECSH Public Key File Format"
-.%N draft-ietf-secsh-publickeyfile-01.txt
-.%D March 2001
-.%O work in progress material
+.%R RFC 4716
+.%T "The Secure Shell (SSH) Public Key File Format"
+.%D 2006

 .Re
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 .Re
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free