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 | |
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
-rw-r--r-- | ssh-keygen.1 | 13 | ||||
-rw-r--r-- | ssh-keygen.c | 15 |
2 files changed, 18 insertions, 10 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 9b4d9337d..9198a511f 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.204 2020/07/15 04:27:34 dtucker Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.205 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) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -44,16 +44,18 @@ | |||
44 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
45 | .Nm ssh-keygen | 45 | .Nm ssh-keygen |
46 | .Op Fl q | 46 | .Op Fl q |
47 | .Op Fl a Ar rounds | ||
47 | .Op Fl b Ar bits | 48 | .Op Fl b Ar bits |
48 | .Op Fl C Ar comment | 49 | .Op Fl C Ar comment |
49 | .Op Fl f Ar output_keyfile | 50 | .Op Fl f Ar output_keyfile |
50 | .Op Fl m Ar format | 51 | .Op Fl m Ar format |
51 | .Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa | ||
52 | .Op Fl N Ar new_passphrase | 52 | .Op Fl N Ar new_passphrase |
53 | .Op Fl O Ar option | 53 | .Op Fl O Ar option |
54 | .Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa | ||
54 | .Op Fl w Ar provider | 55 | .Op Fl w Ar provider |
55 | .Nm ssh-keygen | 56 | .Nm ssh-keygen |
56 | .Fl p | 57 | .Fl p |
58 | .Op Fl a Ar rounds | ||
57 | .Op Fl f Ar keyfile | 59 | .Op Fl f Ar keyfile |
58 | .Op Fl m Ar format | 60 | .Op Fl m Ar format |
59 | .Op Fl N Ar new_passphrase | 61 | .Op Fl N Ar new_passphrase |
@@ -71,6 +73,7 @@ | |||
71 | .Op Fl f Ar input_keyfile | 73 | .Op Fl f Ar input_keyfile |
72 | .Nm ssh-keygen | 74 | .Nm ssh-keygen |
73 | .Fl c | 75 | .Fl c |
76 | .Op Fl a Ar rounds | ||
74 | .Op Fl C Ar comment | 77 | .Op Fl C Ar comment |
75 | .Op Fl f Ar keyfile | 78 | .Op Fl f Ar keyfile |
76 | .Op Fl P Ar passphrase | 79 | .Op Fl P Ar passphrase |
@@ -93,6 +96,7 @@ | |||
93 | .Op Fl f Ar known_hosts_file | 96 | .Op Fl f Ar known_hosts_file |
94 | .Nm ssh-keygen | 97 | .Nm ssh-keygen |
95 | .Fl K | 98 | .Fl K |
99 | .Op Fl a Ar rounds | ||
96 | .Op Fl w Ar provider | 100 | .Op Fl w Ar provider |
97 | .Nm ssh-keygen | 101 | .Nm ssh-keygen |
98 | .Fl R Ar hostname | 102 | .Fl R Ar hostname |
@@ -125,6 +129,7 @@ | |||
125 | .Op Fl f Ar input_keyfile | 129 | .Op Fl f Ar input_keyfile |
126 | .Nm ssh-keygen | 130 | .Nm ssh-keygen |
127 | .Fl A | 131 | .Fl A |
132 | .Op Fl a Ar rounds | ||
128 | .Op Fl f Ar prefix_path | 133 | .Op Fl f Ar prefix_path |
129 | .Nm ssh-keygen | 134 | .Nm ssh-keygen |
130 | .Fl k | 135 | .Fl k |
@@ -248,7 +253,9 @@ keys may be converted using this option in conjunction with the | |||
248 | .Fl p | 253 | .Fl p |
249 | (change passphrase) flag. | 254 | (change passphrase) flag. |
250 | .Pp | 255 | .Pp |
251 | After a key is generated, instructions below detail where the keys | 256 | After a key is generated, |
257 | .Nm | ||
258 | will ask where the keys | ||
252 | should be placed to be activated. | 259 | should be placed to be activated. |
253 | .Pp | 260 | .Pp |
254 | The options are as follows: | 261 | The options are as follows: |
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" |