diff options
author | solene@openbsd.org <solene@openbsd.org> | 2020-07-15 07:50:46 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-07-17 13:23:34 +1000 |
commit | dbaaa01daedb423c38124a72c471982fb08a16fb (patch) | |
tree | c876d341a8cdcfd2786873cc2c288260ce201bca /ssh-keygen.c | |
parent | 69924a92c3af7b99a7541aa544a2334ec0fb092c (diff) |
upstream: - Add [-a rounds] in ssh-keygen man page and usage() -
Reorder parameters list in the first usage() case - Sentence rewording
ok dtucker@
jmc@ noticed usage() missed -a flag too
OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 7c6f11f40..4a27d3bfd 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.413 2020/06/26 05:02:03 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.414 2020/07/15 07:50:46 solene Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -3035,15 +3035,16 @@ static void | |||
3035 | usage(void) | 3035 | usage(void) |
3036 | { | 3036 | { |
3037 | fprintf(stderr, | 3037 | fprintf(stderr, |
3038 | "usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" | 3038 | "usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n" |
3039 | " [-m format] [-N new_passphrase] [-O option]\n" | ||
3039 | " [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" | 3040 | " [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" |
3040 | " [-N new_passphrase] [-O option] [-w provider]\n" | 3041 | " [-w provider]\n" |
3041 | " ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" | 3042 | " ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n" |
3042 | " [-P old_passphrase]\n" | 3043 | " [-P old_passphrase]\n" |
3043 | " ssh-keygen -i [-f input_keyfile] [-m key_format]\n" | 3044 | " ssh-keygen -i [-f input_keyfile] [-m key_format]\n" |
3044 | " ssh-keygen -e [-f input_keyfile] [-m key_format]\n" | 3045 | " ssh-keygen -e [-f input_keyfile] [-m key_format]\n" |
3045 | " ssh-keygen -y [-f input_keyfile]\n" | 3046 | " ssh-keygen -y [-f input_keyfile]\n" |
3046 | " ssh-keygen -c [-C comment] [-f keyfile] [-P passphrase]\n" | 3047 | " ssh-keygen -c [-a rounds] [-C comment] [-f keyfile] [-P passphrase]\n" |
3047 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" | 3048 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
3048 | " ssh-keygen -B [-f input_keyfile]\n"); | 3049 | " ssh-keygen -B [-f input_keyfile]\n"); |
3049 | #ifdef ENABLE_PKCS11 | 3050 | #ifdef ENABLE_PKCS11 |
@@ -3053,7 +3054,7 @@ usage(void) | |||
3053 | fprintf(stderr, | 3054 | fprintf(stderr, |
3054 | " ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" | 3055 | " ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" |
3055 | " ssh-keygen -H [-f known_hosts_file]\n" | 3056 | " ssh-keygen -H [-f known_hosts_file]\n" |
3056 | " ssh-keygen -K [-w provider]\n" | 3057 | " ssh-keygen -K [-a rounds] [-w provider]\n" |
3057 | " ssh-keygen -R hostname [-f known_hosts_file]\n" | 3058 | " ssh-keygen -R hostname [-f known_hosts_file]\n" |
3058 | " ssh-keygen -r hostname [-g] [-f input_keyfile]\n" | 3059 | " ssh-keygen -r hostname [-g] [-f input_keyfile]\n" |
3059 | #ifdef WITH_OPENSSL | 3060 | #ifdef WITH_OPENSSL |
@@ -3064,7 +3065,7 @@ usage(void) | |||
3064 | " [-n principals] [-O option] [-V validity_interval]\n" | 3065 | " [-n principals] [-O option] [-V validity_interval]\n" |
3065 | " [-z serial_number] file ...\n" | 3066 | " [-z serial_number] file ...\n" |
3066 | " ssh-keygen -L [-f input_keyfile]\n" | 3067 | " ssh-keygen -L [-f input_keyfile]\n" |
3067 | " ssh-keygen -A [-f prefix_path]\n" | 3068 | " ssh-keygen -A [-a rounds] [-f prefix_path]\n" |
3068 | " ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" | 3069 | " ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" |
3069 | " file ...\n" | 3070 | " file ...\n" |
3070 | " ssh-keygen -Q [-l] -f krl_file [file ...]\n" | 3071 | " ssh-keygen -Q [-l] -f krl_file [file ...]\n" |