diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 33 |
2 files changed, 24 insertions, 14 deletions
@@ -1,6 +1,9 @@ | |||
1 | 20050525 | 1 | 20050525 |
2 | - (djm) [mpaux.c mpaux.h Makefile.in] Remove old mpaux.[ch] code, it has not | 2 | - (djm) [mpaux.c mpaux.h Makefile.in] Remove old mpaux.[ch] code, it has not |
3 | been used for a while | 3 | been used for a while |
4 | - (djm) OpenBSD CVS Sync | ||
5 | - otto@cvs.openbsd.org 2005/04/05 13:45:31 | ||
6 | [ssh-keygen.c] | ||
4 | 7 | ||
5 | 20050524 | 8 | 20050524 |
6 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] | 9 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
@@ -2500,4 +2503,4 @@ | |||
2500 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2503 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2501 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2504 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2502 | 2505 | ||
2503 | $Id: ChangeLog,v 1.3761 2005/05/26 01:35:37 djm Exp $ | 2506 | $Id: ChangeLog,v 1.3762 2005/05/26 01:59:06 djm Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 92885506a..6f0713dab 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.122 2005/03/11 14:59:06 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.123 2005/04/05 13:45:31 otto Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -959,31 +959,38 @@ usage(void) | |||
959 | { | 959 | { |
960 | fprintf(stderr, "Usage: %s [options]\n", __progname); | 960 | fprintf(stderr, "Usage: %s [options]\n", __progname); |
961 | fprintf(stderr, "Options:\n"); | 961 | fprintf(stderr, "Options:\n"); |
962 | fprintf(stderr, " -a trials Number of trials for screening DH-GEX moduli.\n"); | ||
963 | fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); | ||
962 | fprintf(stderr, " -b bits Number of bits in the key to create.\n"); | 964 | fprintf(stderr, " -b bits Number of bits in the key to create.\n"); |
965 | fprintf(stderr, " -C comment Provide new comment.\n"); | ||
963 | fprintf(stderr, " -c Change comment in private and public key files.\n"); | 966 | fprintf(stderr, " -c Change comment in private and public key files.\n"); |
967 | #ifdef SMARTCARD | ||
968 | fprintf(stderr, " -D reader Download public key from smartcard.\n"); | ||
969 | #endif /* SMARTCARD */ | ||
964 | fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n"); | 970 | fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n"); |
971 | fprintf(stderr, " -F hostname Find hostname in known hosts file.\n"); | ||
965 | fprintf(stderr, " -f filename Filename of the key file.\n"); | 972 | fprintf(stderr, " -f filename Filename of the key file.\n"); |
973 | fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n"); | ||
966 | fprintf(stderr, " -g Use generic DNS resource record format.\n"); | 974 | fprintf(stderr, " -g Use generic DNS resource record format.\n"); |
975 | fprintf(stderr, " -H Hash names in known_hosts file.\n"); | ||
967 | fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n"); | 976 | fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n"); |
968 | fprintf(stderr, " -l Show fingerprint of key file.\n"); | 977 | fprintf(stderr, " -l Show fingerprint of key file.\n"); |
969 | fprintf(stderr, " -p Change passphrase of private key file.\n"); | 978 | fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n"); |
970 | fprintf(stderr, " -q Quiet.\n"); | ||
971 | fprintf(stderr, " -y Read private key file and print public key.\n"); | ||
972 | fprintf(stderr, " -t type Specify type of key to create.\n"); | ||
973 | fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); | ||
974 | fprintf(stderr, " -H Hash names in known_hosts file\n"); | ||
975 | fprintf(stderr, " -F hostname Find hostname in known hosts file\n"); | ||
976 | fprintf(stderr, " -C comment Provide new comment.\n"); | ||
977 | fprintf(stderr, " -N phrase Provide new passphrase.\n"); | 979 | fprintf(stderr, " -N phrase Provide new passphrase.\n"); |
978 | fprintf(stderr, " -P phrase Provide old passphrase.\n"); | 980 | fprintf(stderr, " -P phrase Provide old passphrase.\n"); |
981 | fprintf(stderr, " -p Change passphrase of private key file.\n"); | ||
982 | fprintf(stderr, " -q Quiet.\n"); | ||
983 | fprintf(stderr, " -R hostname Remove host from known_hosts file.\n"); | ||
979 | fprintf(stderr, " -r hostname Print DNS resource record.\n"); | 984 | fprintf(stderr, " -r hostname Print DNS resource record.\n"); |
985 | fprintf(stderr, " -S start Start point (hex) for generating DH-GEX moduli.\n"); | ||
986 | fprintf(stderr, " -T file Screen candidates for DH-GEX moduli.\n"); | ||
987 | fprintf(stderr, " -t type Specify type of key to create.\n"); | ||
980 | #ifdef SMARTCARD | 988 | #ifdef SMARTCARD |
981 | fprintf(stderr, " -D reader Download public key from smartcard.\n"); | ||
982 | fprintf(stderr, " -U reader Upload private key to smartcard.\n"); | 989 | fprintf(stderr, " -U reader Upload private key to smartcard.\n"); |
983 | #endif /* SMARTCARD */ | 990 | #endif /* SMARTCARD */ |
984 | 991 | fprintf(stderr, " -v Verbose.\n"); | |
985 | fprintf(stderr, " -G file Generate candidates for DH-GEX moduli\n"); | 992 | fprintf(stderr, " -W gen Generator to use for generating DH-GEX moduli.\n"); |
986 | fprintf(stderr, " -T file Screen candidates for DH-GEX moduli\n"); | 993 | fprintf(stderr, " -y Read private key file and print public key.\n"); |
987 | 994 | ||
988 | exit(1); | 995 | exit(1); |
989 | } | 996 | } |