drop support for old external-keyx and gssapi methods

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

diff --git a/openssh/ssh-keygen.1 b/openssh/ssh-keygen.1
index 000e8ff2a461271b8b2f4c5cfdfbe0cfef68bca7..622cb5c9973974ab449271d96fd42c31ee176990 100644 (file)
--- a/openssh/ssh-keygen.1
+++ b/openssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keygen.1,v 1.56 2003/03/28 10:11:43 jmc Exp $
+.\"    $OpenBSD: ssh-keygen.1,v 1.50 2001/10/25 21:14:32 markus Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -45,14 +45,12 @@
 .Nd authentication key generation, management and conversion
 .Sh SYNOPSIS
 .Nm ssh-keygen
-.Bk -words
 .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
-.Ek
 .Nm ssh-keygen
 .Fl p
 .Op Fl P Ar old_passphrase
@@ -88,11 +86,10 @@
 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
-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
@@ -114,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.
-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
-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.
@@ -149,7 +142,8 @@ The options are as follows:
 .It Fl b Ar bits
 Specifies the number of bits in the key to create.
 Minimum is 512 bits.
-Generally, 1024 bits is considered sufficient.
+Generally 1024 bits is considered sufficient, and key sizes
+above that no longer improve security but make things slower.
 The default is 1024 bits.
 .It Fl c
 Requests changing the comment in the private and public key files.
@@ -204,6 +198,8 @@ for protocol version 1 and
 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