diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:49:06 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:49:06 +0000 |
commit | 97be31e6ff07b4d396e95b0799dca754f013e1a8 (patch) | |
tree | 5fcd281244f24336f17cb06c4ed834906bac9aa3 | |
parent | f19578c447a5a9de60ab6b743ba67836d1f094e3 (diff) |
- jakob@cvs.openbsd.org 2001/08/02 15:06:52
[ssh-keygen.c]
more verbose usage(). ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 25 |
2 files changed, 26 insertions, 4 deletions
@@ -110,6 +110,9 @@ | |||
110 | - jakob@cvs.openbsd.org 2001/08/02 08:58:35 | 110 | - jakob@cvs.openbsd.org 2001/08/02 08:58:35 |
111 | [ssh-keygen.c] | 111 | [ssh-keygen.c] |
112 | change -u (upload smartcard key) to -U. ok markus@ | 112 | change -u (upload smartcard key) to -U. ok markus@ |
113 | - jakob@cvs.openbsd.org 2001/08/02 15:06:52 | ||
114 | [ssh-keygen.c] | ||
115 | more verbose usage(). ok markus@ | ||
113 | 116 | ||
114 | 20010803 | 117 | 20010803 |
115 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 118 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6220,4 +6223,4 @@ | |||
6220 | - Wrote replacements for strlcpy and mkdtemp | 6223 | - Wrote replacements for strlcpy and mkdtemp |
6221 | - Released 1.0pre1 | 6224 | - Released 1.0pre1 |
6222 | 6225 | ||
6223 | $Id: ChangeLog,v 1.1454 2001/08/06 21:46:54 mouring Exp $ | 6226 | $Id: ChangeLog,v 1.1455 2001/08/06 21:49:06 mouring Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index beffa928c..faa27d219 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.76 2001/08/02 08:58:35 jakob Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.77 2001/08/02 15:06:52 jakob Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -792,8 +792,27 @@ do_change_comment(struct passwd *pw) | |||
792 | static void | 792 | static void |
793 | usage(void) | 793 | usage(void) |
794 | { | 794 | { |
795 | printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] " | 795 | fprintf(stderr, "Usage: %s [options]\n", __progname); |
796 | "[-N new-pass] [-P pass]\n", __progname); | 796 | fprintf(stderr, "Options:\n"); |
797 | fprintf(stderr, " -b bits Number of bits in the key to create.\n"); | ||
798 | fprintf(stderr, " -c Change comment in private and public key files.\n"); | ||
799 | fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n"); | ||
800 | fprintf(stderr, " -f filename Filename of the key file.\n"); | ||
801 | fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n"); | ||
802 | fprintf(stderr, " -l Show fingerprint of key file.\n"); | ||
803 | fprintf(stderr, " -p Change passphrase of private key file.\n"); | ||
804 | fprintf(stderr, " -q Quiet.\n"); | ||
805 | fprintf(stderr, " -y Read private key file and print public key.\n"); | ||
806 | fprintf(stderr, " -t type Specify type of key to create.\n"); | ||
807 | fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); | ||
808 | fprintf(stderr, " -C comment Provide new comment.\n"); | ||
809 | fprintf(stderr, " -N phrase Provide new passphrase.\n"); | ||
810 | fprintf(stderr, " -P phrase Provide old passphrase.\n"); | ||
811 | #ifdef SMARTCARD | ||
812 | fprintf(stderr, " -D reader Download public key from smartcard.\n"); | ||
813 | fprintf(stderr, " -U reader Upload private key to smartcard.\n"); | ||
814 | #endif /* SMARTCARD */ | ||
815 | |||
797 | exit(1); | 816 | exit(1); |
798 | } | 817 | } |
799 | 818 | ||