summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.18
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a83c16d5..f7602a1b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@
52 - djm@cvs.openbsd.org 2011/04/13 04:02:48 52 - djm@cvs.openbsd.org 2011/04/13 04:02:48
53 [ssh-keygen.1] 53 [ssh-keygen.1]
54 improve wording; bz#1861 54 improve wording; bz#1861
55 - djm@cvs.openbsd.org 2011/04/13 04:09:37
56 [ssh-keygen.1]
57 mention valid -b sizes for ECDSA keys; bz#1862
55 58
5620110221 5920110221
57 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 60 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 51a152eef..ede37921c 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.105 2011/04/13 04:02:48 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.106 2011/04/13 04:09:37 djm Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -212,6 +212,12 @@ Specifies the number of bits in the key to create.
212For RSA keys, the minimum size is 768 bits and the default is 2048 bits. 212For RSA keys, the minimum size is 768 bits and the default is 2048 bits.
213Generally, 2048 bits is considered sufficient. 213Generally, 2048 bits is considered sufficient.
214DSA keys must be exactly 1024 bits as specified by FIPS 186-2. 214DSA keys must be exactly 1024 bits as specified by FIPS 186-2.
215For ECDSA keys, the
216.Fl b
217flag determines they key length by selecting from one of three elliptic
218curve sizes: 256, 384 or 521 bits.
219Attempting to use bit lengths other than these three values for ECDSA keys
220will fail.
215.It Fl C Ar comment 221.It Fl C Ar comment
216Provides a new comment. 222Provides a new comment.
217.It Fl c 223.It Fl c