diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.1 | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -19,6 +19,9 @@ | |||
19 | - markus@cvs.openbsd.org 2001/04/22 13:32:27 | 19 | - markus@cvs.openbsd.org 2001/04/22 13:32:27 |
20 | [sftp-server.8 sftp.1 ssh.1 sshd.8] | 20 | [sftp-server.8 sftp.1 ssh.1 sshd.8] |
21 | xref draft-ietf-secsh-* | 21 | xref draft-ietf-secsh-* |
22 | - markus@cvs.openbsd.org 2001/04/22 13:41:02 | ||
23 | [ssh-keygen.1 ssh-keygen.c] | ||
24 | style, noted by stevesk; sort flags in usage | ||
22 | 25 | ||
23 | 20010421 | 26 | 20010421 |
24 | - OpenBSD CVS Sync | 27 | - OpenBSD CVS Sync |
@@ -5222,4 +5225,4 @@ | |||
5222 | - Wrote replacements for strlcpy and mkdtemp | 5225 | - Wrote replacements for strlcpy and mkdtemp |
5223 | - Released 1.0pre1 | 5226 | - Released 1.0pre1 |
5224 | 5227 | ||
5225 | $Id: ChangeLog,v 1.1158 2001/04/22 17:17:46 mouring Exp $ | 5228 | $Id: ChangeLog,v 1.1159 2001/04/22 17:19:46 mouring Exp $ |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 55e31de9e..e2e4bc45b 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.37 2001/04/22 13:25:37 markus Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.38 2001/04/22 13:41:02 markus Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -157,7 +157,7 @@ This option will read an unencrypted private (or public) key file | |||
157 | in SSH2-compatible format and print an OpenSSH compatible private | 157 | in SSH2-compatible format and print an OpenSSH compatible private |
158 | (or public) key to stdout. | 158 | (or public) key to stdout. |
159 | .Nm | 159 | .Nm |
160 | does also read the | 160 | also reads the |
161 | .Sq SECSH Public Key File Format . | 161 | .Sq SECSH Public Key File Format . |
162 | This option allows importing keys from several commercial | 162 | This option allows importing keys from several commercial |
163 | SSH implementations. | 163 | SSH implementations. |
diff --git a/ssh-keygen.c b/ssh-keygen.c index cb48b2f9d..5549376fd 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.57 2001/04/22 13:25:37 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.58 2001/04/22 13:41:02 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -628,7 +628,7 @@ do_change_comment(struct passwd *pw) | |||
628 | void | 628 | void |
629 | usage(void) | 629 | usage(void) |
630 | { | 630 | { |
631 | printf("Usage: %s [-lBpqxiec] [-t type] [-b bits] [-f file] [-C comment] " | 631 | printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] " |
632 | "[-N new-pass] [-P pass]\n", __progname); | 632 | "[-N new-pass] [-P pass]\n", __progname); |
633 | exit(1); | 633 | exit(1); |
634 | } | 634 | } |