1 files changed, 57 insertions, 6 deletions

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 486de0421..50e74e110 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 23:55:14 1995 ylo
 .\"
-.\" $Id: ssh-keygen.1,v 1.13 2000/04/29 13:57:12 damien Exp $
+.\" $Id: ssh-keygen.1,v 1.14 2000/05/07 02:03:18 damien Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH-KEYGEN 1
@@ -19,7 +19,7 @@
 .Nd authentication key generation
 .Sh SYNOPSIS
 .Nm ssh-keygen
-.Op Fl q
+.Op Fl dq
 .Op Fl b Ar bits
 .Op Fl N Ar new_passphrase
 .Op Fl C Ar comment
@@ -30,6 +30,15 @@
 .Op Fl N Ar new_passphrase
 .Op Fl f Ar keyfile
 .Nm ssh-keygen
+.Fl x
+.Op Fl f Ar keyfile
+.Nm ssh-keygen
+.Fl X
+.Op Fl f Ar keyfile
+.Nm ssh-keygen
+.Fl y
+.Op Fl f Ar keyfile
+.Nm ssh-keygen
 .Fl c
 .Op Fl P Ar passphrase
 .Op Fl C Ar comment
@@ -43,11 +52,21 @@
 .Nm
 generates and manages authentication keys for
 .Xr ssh 1 .
+.Nm
+defaults to generating an RSA key for use by protocols 1.3 and 1.5;
+specifying the
+.Fl d
+flag will create a DSA key instead for use by protocol 2.0.
+.Pp
 Normally each user wishing to use SSH
-with RSA authentication runs this once to create the authentication
+with RSA or DSA authentication runs this once to create the authentication
 key in
-.Pa $HOME/.ssh/identity .
-Additionally, the system administrator may use this to generate host keys.
+.Pa $HOME/.ssh/identity
+or
+.Pa $HOME/.ssh/id_dsa .
+Additionally, the system administrator may use this to generate host keys,
+as seen in
+.Pa /etc/rc .
 .Pp
 Normally this program generates the key and asks for a file in which
 to store the private key.
@@ -71,7 +90,7 @@ If the passphrase is
 lost or forgotten, you will have to generate a new key and copy the
 corresponding public key to other machines.
 .Pp
-There is also a comment field in the key file that is only for
+For RSA, there is also a comment field in the key file that is only for
 convenience to the user to help identify the key.
 The comment can tell what the key is for, or whatever is useful.
 The comment is initialized to
@@ -80,6 +99,9 @@ when the key is created, but can be changed using the
 .Fl c
 option.
 .Pp
+After a key is generated, instructions below detail where the keys
+should be placed to be activated.
+.Pp
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl b Ar bits
@@ -118,6 +140,15 @@ Provides the (old) passphrase.
 If RSA support is functional, immediately exits with code 0.  If RSA
 support is not functional, exits with code 1.  This flag will be
 removed once the RSA patent expires.
+.It Fl x
+This option will read a private
+OpenSSH DSA format file and prints to stdout a SSH2-compatible public key.
+.It Fl X
+This option will read a
+SSH2-compatible public key file and print to stdout an OpenSSH DSA compatible public key.
+.It Fl y
+This option will read a private
+OpenSSH DSA format file and prints to stdout an OpenSSH DSA public key.
 .El
 .Sh FILES
 .Bl -tag -width Ds
@@ -130,6 +161,8 @@ used to encrypt the private part of this file using 3DES.
 This file is not automatically accessed by
 .Nm
 but it is offered as the default file for the private key.
+.Xr sshd 8
+will read this file when a login attempt is made.
 .It Pa $HOME/.ssh/identity.pub
 Contains the public key for authentication.
 The contents of this file should be added to
@@ -137,6 +170,24 @@ The contents of this file should be added to
 on all machines
 where you wish to log in using RSA authentication.
 There is no need to keep the contents of this file secret.
+.It Pa $HOME/.ssh/id_dsa
+Contains the 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
+used to encrypt the private part of this file using 3DES.
+This file is not automatically accessed by
+.Nm
+but it is offered as the default file for the private key.
+.Xr sshd 8
+will read this file when a login attempt is made.
+.It Pa $HOME/.ssh/id_dsa.pub
+Contains the public key for authentication.
+The contents of this file should be added to
+.Pa $HOME/.ssh/authorized_keys2
+on all machines
+where you wish to log in using DSA authentication.
+There is no need to keep the contents of this file secret.
 .Sh AUTHOR
 Tatu Ylonen <ylo@cs.hut.fi>
 .Pp