summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.110
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c88aff274..f7d078a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - markus@cvs.openbsd.org 2001/11/21 15:51:24 23 - markus@cvs.openbsd.org 2001/11/21 15:51:24
24 [key.c] 24 [key.c]
25 mem leak 25 mem leak
26 - stevesk@cvs.openbsd.org 2001/11/21 18:49:14
27 [ssh-keygen.1]
28 more on passphrase construction; ok markus@
26 29
2720011126 3020011126
28 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, 31 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@@ -6945,4 +6948,4 @@
6945 - Wrote replacements for strlcpy and mkdtemp 6948 - Wrote replacements for strlcpy and mkdtemp
6946 - Released 1.0pre1 6949 - Released 1.0pre1
6947 6950
6948$Id: ChangeLog,v 1.1673 2001/12/06 16:41:41 mouring Exp $ 6951$Id: ChangeLog,v 1.1674 2001/12/06 16:43:21 mouring Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 622cb5c99..d8baa43bc 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.50 2001/10/25 21:14:32 markus Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.51 2001/11/21 18:49:14 stevesk Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -111,10 +111,14 @@ The program also asks for a passphrase.
111The passphrase may be empty to indicate no passphrase 111The passphrase may be empty to indicate no passphrase
112(host keys must have an empty passphrase), or it may be a string of 112(host keys must have an empty passphrase), or it may be a string of
113arbitrary length. 113arbitrary length.
114Good passphrases are 10-30 characters long and are 114A passphrase is similar to a password, except it can be a phrase with a
115series of words, punctuation, numbers, whitespace, or any string of
116characters you want.
117Good passphrases are 10-30 characters long, are
115not simple sentences or otherwise easily guessable (English 118not simple sentences or otherwise easily guessable (English
116prose has only 1-2 bits of entropy per character, and provides very bad 119prose has only 1-2 bits of entropy per character, and provides very bad
117passphrases). 120passphrases), and contain a mix of upper and lowercase letters,
121numbers, and non-alphanumeric characters.
118The passphrase can be changed later by using the 122The passphrase can be changed later by using the
119.Fl p 123.Fl p
120option. 124option.