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.1 | |
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.1')
-rw-r--r-- | ssh-keygen.1 | 13 |
1 files changed, 10 insertions, 3 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: |