diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.1 | 7 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
3 files changed, 7 insertions, 9 deletions
@@ -22,6 +22,9 @@ | |||
22 | - deraadt@cvs.openbsd.org 2001/02/22 06:43:55 | 22 | - deraadt@cvs.openbsd.org 2001/02/22 06:43:55 |
23 | [ssh-keygen.1 ssh-keygen.c] | 23 | [ssh-keygen.1 ssh-keygen.c] |
24 | document -d, and -t defaults to rsa1 | 24 | document -d, and -t defaults to rsa1 |
25 | - deraadt@cvs.openbsd.org 2001/02/22 08:03:51 | ||
26 | [ssh-keygen.1 ssh-keygen.c] | ||
27 | bye bye -d | ||
25 | 28 | ||
26 | 20010304 | 29 | 20010304 |
27 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 30 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4214,4 +4217,4 @@ | |||
4214 | - Wrote replacements for strlcpy and mkdtemp | 4217 | - Wrote replacements for strlcpy and mkdtemp |
4215 | - Released 1.0pre1 | 4218 | - Released 1.0pre1 |
4216 | 4219 | ||
4217 | $Id: ChangeLog,v 1.858 2001/03/05 05:10:52 mouring Exp $ | 4220 | $Id: ChangeLog,v 1.859 2001/03/05 05:13:38 mouring Exp $ |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 516e05ed4..caaf0b150 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.31 2001/02/22 06:43:55 deraadt Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.32 2001/02/22 08:03:51 deraadt Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -166,11 +166,6 @@ or | |||
166 | for protocol version 2. | 166 | for protocol version 2. |
167 | The default is | 167 | The default is |
168 | .Dq rsa1 . | 168 | .Dq rsa1 . |
169 | .It Fl d | ||
170 | Specifies | ||
171 | .Dq dsa | ||
172 | key type (shortcut for | ||
173 | .Fl t Ar dsa) | ||
174 | .It Fl C Ar comment | 169 | .It Fl C Ar comment |
175 | Provides the new comment. | 170 | Provides the new comment. |
176 | .It Fl N Ar new_passphrase | 171 | .It Fl N Ar new_passphrase |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 3fd0e3df5..e5e34cb2f 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.44 2001/02/22 06:43:55 deraadt Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.45 2001/02/22 08:03:51 deraadt Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -605,7 +605,7 @@ do_change_comment(struct passwd *pw) | |||
605 | void | 605 | void |
606 | usage(void) | 606 | usage(void) |
607 | { | 607 | { |
608 | printf("Usage: %s [-lpqxXycd] [-t type] [-b bits] [-f file] [-C comment] " | 608 | printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] " |
609 | "[-N new-pass] [-P pass]\n", __progname); | 609 | "[-N new-pass] [-P pass]\n", __progname); |
610 | exit(1); | 610 | exit(1); |
611 | } | 611 | } |