summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.19
-rw-r--r--ssh-keygen.c5
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 964bf3383..2488b94d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 - deraadt@cvs.openbsd.org 2001/02/22 04:29:37 19 - deraadt@cvs.openbsd.org 2001/02/22 04:29:37
20 [servconf.c] 20 [servconf.c]
21 grammar; slade@shore.net 21 grammar; slade@shore.net
22 - deraadt@cvs.openbsd.org 2001/02/22 06:43:55
23 [ssh-keygen.1 ssh-keygen.c]
24 document -d, and -t defaults to rsa1
22 25
2320010304 2620010304
24 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 27 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4211,4 +4214,4 @@
4211 - Wrote replacements for strlcpy and mkdtemp 4214 - Wrote replacements for strlcpy and mkdtemp
4212 - Released 1.0pre1 4215 - Released 1.0pre1
4213 4216
4214$Id: ChangeLog,v 1.857 2001/03/05 05:07:52 mouring Exp $ 4217$Id: ChangeLog,v 1.858 2001/03/05 05:10:52 mouring Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 6661bfb10..516e05ed4 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.30 2001/02/08 19:22:38 itojun Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.31 2001/02/22 06:43:55 deraadt Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -165,7 +165,12 @@ or
165.Dq dsa 165.Dq dsa
166for protocol version 2. 166for protocol version 2.
167The default is 167The default is
168.Dq rsa . 168.Dq rsa1 .
169.It Fl d
170Specifies
171.Dq dsa
172key type (shortcut for
173.Fl t Ar dsa)
169.It Fl C Ar comment 174.It Fl C Ar comment
170Provides the new comment. 175Provides the new comment.
171.It Fl N Ar new_passphrase 176.It Fl N Ar new_passphrase
diff --git a/ssh-keygen.c b/ssh-keygen.c
index f573db481..3fd0e3df5 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"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.43 2001/02/12 16:16:23 markus Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.44 2001/02/22 06:43:55 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,8 @@ do_change_comment(struct passwd *pw)
605void 605void
606usage(void) 606usage(void)
607{ 607{
608 printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname); 608 printf("Usage: %s [-lpqxXycd] [-t type] [-b bits] [-f file] [-C comment] "
609 "[-N new-pass] [-P pass]\n", __progname);
609 exit(1); 610 exit(1);
610} 611}
611 612