wrap new GSSAPI code (from Simon) in #ifdef GSSAPI

[gssapi-openssh.git] / openssh / ssh-keygen.1

diff --git a/openssh/ssh-keygen.1 b/openssh/ssh-keygen.1
index 35b0bb91605aa258f4cd7fc0fb012d6ef038bcd6..622cb5c9973974ab449271d96fd42c31ee176990 100644 (file)
--- a/openssh/ssh-keygen.1
+++ b/openssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keygen.1,v 1.54 2002/06/19 00:27:55 deraadt Exp $
+.\"    $OpenBSD: ssh-keygen.1,v 1.50 2001/10/25 21:14:32 markus Exp $

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


@@ -47,7 +47,7 @@
 .Nm ssh-keygen
 .Op Fl q
 .Op Fl b Ar bits
 .Nm ssh-keygen
 .Op Fl q
 .Op Fl b Ar bits

-.Fl t Ar type
+.Op Fl t Ar type

 .Op Fl N Ar new_passphrase
 .Op Fl C Ar comment
 .Op Fl f Ar output_keyfile
 .Op Fl N Ar new_passphrase
 .Op Fl C Ar comment
 .Op Fl f Ar output_keyfile


@@ -86,11 +86,10 @@
 generates, manages and converts authentication keys for
 .Xr ssh 1 .
 .Nm
 generates, manages and converts authentication keys for
 .Xr ssh 1 .
 .Nm

-can create RSA keys for use by SSH protocol version 1 and RSA or DSA
-keys for use by SSH protocol version 2. The type of key to be generated
-is specified with the
+defaults to generating a RSA1 key for use by SSH protocol version 1.
+Specifying the

 .Fl t
 .Fl t

-option.
+option instead creates a key for use by SSH protocol version 2.

 .Pp
 Normally each user wishing to use SSH
 with RSA or DSA authentication runs this once to create the authentication
 .Pp
 Normally each user wishing to use SSH
 with RSA or DSA authentication runs this once to create the authentication


@@ -112,14 +111,10 @@ The program also asks for a passphrase.
 The passphrase may be empty to indicate no passphrase
 (host keys must have an empty passphrase), or it may be a string of
 arbitrary length.
 The passphrase may be empty to indicate no passphrase
 (host keys must have an empty passphrase), or it may be a string of
 arbitrary length.

-A passphrase is similar to a password, except it can be a phrase with a
-series of words, punctuation, numbers, whitespace, or any string of
-characters you want.
-Good passphrases are 10-30 characters long, are
+Good passphrases are 10-30 characters long and are

 not simple sentences or otherwise easily guessable (English
 prose has only 1-2 bits of entropy per character, and provides very bad
 not simple sentences or otherwise easily guessable (English
 prose has only 1-2 bits of entropy per character, and provides very bad

-passphrases), and contain a mix of upper and lowercase letters,
-numbers, and non-alphanumeric characters.
+passphrases).

 The passphrase can be changed later by using the
 .Fl p
 option.
 The passphrase can be changed later by using the
 .Fl p
 option.


@@ -203,6 +198,8 @@ for protocol version 1 and
 or
 .Dq dsa
 for protocol version 2.
 or
 .Dq dsa
 for protocol version 2.

+The default is
+.Dq rsa1 .

 .It Fl B
 Show the bubblebabble digest of specified private or public key file.
 .It Fl C Ar comment
 .It Fl B
 Show the bubblebabble digest of specified private or public key file.
 .It Fl C Ar comment