diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-10-03 17:07:50 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-10-04 13:40:57 +1000 |
commit | 6918974405cc28ed977f802fd97a9c9a9b2e141b (patch) | |
tree | ca712dfece5455041ebd85a3b36568b98a07aae6 | |
parent | feff96b7d4c0b99307f0459cbff128aede4a8984 (diff) |
upstream: use a more common options order in SYNOPSIS and sync
usage(); while here, no need for Bk/Ek;
ok dtucker
OpenBSD-Commit-ID: 38715c3f10b166f599a2283eb7bc14860211bb90
-rw-r--r-- | ssh-keygen.1 | 34 | ||||
-rw-r--r-- | ssh-keygen.c | 34 |
2 files changed, 33 insertions, 35 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 637dd4231..957d2f0f0 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.170 2019/09/29 16:31:57 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.171 2019/10/03 17:07:50 jmc 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 |
@@ -35,44 +35,43 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: September 29 2019 $ | 38 | .Dd $Mdocdate: October 3 2019 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
42 | .Nm ssh-keygen | 42 | .Nm ssh-keygen |
43 | .Nd authentication key generation, management and conversion | 43 | .Nd authentication key generation, management and conversion |
44 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
45 | .Bk -words | ||
46 | .Nm ssh-keygen | 45 | .Nm ssh-keygen |
47 | .Op Fl q | 46 | .Op Fl q |
48 | .Op Fl b Ar bits | 47 | .Op Fl b Ar bits |
49 | .Op Fl t Cm dsa | ecdsa | ed25519 | rsa | ||
50 | .Op Fl N Ar new_passphrase | ||
51 | .Op Fl C Ar comment | 48 | .Op Fl C Ar comment |
52 | .Op Fl f Ar output_keyfile | 49 | .Op Fl f Ar output_keyfile |
53 | .Op Fl m Ar format | 50 | .Op Fl m Ar format |
51 | .Op Fl N Ar new_passphrase | ||
52 | .Op Fl t Cm dsa | ecdsa | ed25519 | rsa | ||
54 | .Nm ssh-keygen | 53 | .Nm ssh-keygen |
55 | .Fl p | 54 | .Fl p |
56 | .Op Fl P Ar old_passphrase | ||
57 | .Op Fl N Ar new_passphrase | ||
58 | .Op Fl f Ar keyfile | 55 | .Op Fl f Ar keyfile |
59 | .Op Fl m Ar format | 56 | .Op Fl m Ar format |
57 | .Op Fl N Ar new_passphrase | ||
58 | .Op Fl P Ar old_passphrase | ||
60 | .Nm ssh-keygen | 59 | .Nm ssh-keygen |
61 | .Fl i | 60 | .Fl i |
62 | .Op Fl m Ar key_format | ||
63 | .Op Fl f Ar input_keyfile | 61 | .Op Fl f Ar input_keyfile |
62 | .Op Fl m Ar key_format | ||
64 | .Nm ssh-keygen | 63 | .Nm ssh-keygen |
65 | .Fl e | 64 | .Fl e |
66 | .Op Fl m Ar key_format | ||
67 | .Op Fl f Ar input_keyfile | 65 | .Op Fl f Ar input_keyfile |
66 | .Op Fl m Ar key_format | ||
68 | .Nm ssh-keygen | 67 | .Nm ssh-keygen |
69 | .Fl y | 68 | .Fl y |
70 | .Op Fl f Ar input_keyfile | 69 | .Op Fl f Ar input_keyfile |
71 | .Nm ssh-keygen | 70 | .Nm ssh-keygen |
72 | .Fl c | 71 | .Fl c |
73 | .Op Fl P Ar passphrase | ||
74 | .Op Fl C Ar comment | 72 | .Op Fl C Ar comment |
75 | .Op Fl f Ar keyfile | 73 | .Op Fl f Ar keyfile |
74 | .Op Fl P Ar passphrase | ||
76 | .Nm ssh-keygen | 75 | .Nm ssh-keygen |
77 | .Fl l | 76 | .Fl l |
78 | .Op Fl v | 77 | .Op Fl v |
@@ -104,8 +103,8 @@ | |||
104 | .Op Fl M Ar memory | 103 | .Op Fl M Ar memory |
105 | .Op Fl S Ar start_point | 104 | .Op Fl S Ar start_point |
106 | .Nm ssh-keygen | 105 | .Nm ssh-keygen |
107 | .Fl T Ar output_file | ||
108 | .Fl f Ar input_file | 106 | .Fl f Ar input_file |
107 | .Fl T Ar output_file | ||
109 | .Op Fl v | 108 | .Op Fl v |
110 | .Op Fl a Ar rounds | 109 | .Op Fl a Ar rounds |
111 | .Op Fl J Ar num_lines | 110 | .Op Fl J Ar num_lines |
@@ -113,8 +112,8 @@ | |||
113 | .Op Fl K Ar checkpt | 112 | .Op Fl K Ar checkpt |
114 | .Op Fl W Ar generator | 113 | .Op Fl W Ar generator |
115 | .Nm ssh-keygen | 114 | .Nm ssh-keygen |
116 | .Fl s Ar ca_key | ||
117 | .Fl I Ar certificate_identity | 115 | .Fl I Ar certificate_identity |
116 | .Fl s Ar ca_key | ||
118 | .Op Fl hU | 117 | .Op Fl hU |
119 | .Op Fl D Ar pkcs11_provider | 118 | .Op Fl D Ar pkcs11_provider |
120 | .Op Fl n Ar principals | 119 | .Op Fl n Ar principals |
@@ -140,22 +139,21 @@ | |||
140 | .Fl f Ar krl_file | 139 | .Fl f Ar krl_file |
141 | .Ar | 140 | .Ar |
142 | .Nm ssh-keygen | 141 | .Nm ssh-keygen |
142 | .Fl Y Cm check-novalidate | ||
143 | .Fl n Ar namespace | ||
144 | .Fl s Ar signature_file | ||
145 | .Nm ssh-keygen | ||
143 | .Fl Y Cm sign | 146 | .Fl Y Cm sign |
144 | .Fl f Ar key_file | 147 | .Fl f Ar key_file |
145 | .Fl n Ar namespace | 148 | .Fl n Ar namespace |
146 | .Ar | 149 | .Ar |
147 | .Nm ssh-keygen | 150 | .Nm ssh-keygen |
148 | .Fl Y Cm verify | 151 | .Fl Y Cm verify |
149 | .Fl I Ar signer_identity | ||
150 | .Fl f Ar allowed_signers_file | 152 | .Fl f Ar allowed_signers_file |
153 | .Fl I Ar signer_identity | ||
151 | .Fl n Ar namespace | 154 | .Fl n Ar namespace |
152 | .Fl s Ar signature_file | 155 | .Fl s Ar signature_file |
153 | .Op Fl r Ar revocation_file | 156 | .Op Fl r Ar revocation_file |
154 | .Nm ssh-keygen | ||
155 | .Fl Y Cm check-novalidate | ||
156 | .Fl s Ar signature_file | ||
157 | .Fl n Ar namespace | ||
158 | .Ek | ||
159 | .Sh DESCRIPTION | 157 | .Sh DESCRIPTION |
160 | .Nm | 158 | .Nm |
161 | generates, manages and converts authentication keys for | 159 | generates, manages and converts authentication keys for |
diff --git a/ssh-keygen.c b/ssh-keygen.c index e039be304..85fb4424f 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.354 2019/10/02 09:50:50 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.355 2019/10/03 17:07:50 jmc 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 |
@@ -2708,14 +2708,14 @@ static void | |||
2708 | usage(void) | 2708 | usage(void) |
2709 | { | 2709 | { |
2710 | fprintf(stderr, | 2710 | fprintf(stderr, |
2711 | "usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa] [-m format]\n" | 2711 | "usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" |
2712 | " [-N new_passphrase] [-C comment] [-f output_keyfile]\n" | 2712 | " [-N new_passphrase] [-t dsa | ecdsa | ed25519 | rsa]\n" |
2713 | " ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-m format]\n" | 2713 | " ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" |
2714 | " [-f keyfile]\n" | 2714 | " [-P old_passphrase]\n" |
2715 | " ssh-keygen -i [-m key_format] [-f input_keyfile]\n" | 2715 | " ssh-keygen -i [-f input_keyfile] [-m key_format]\n" |
2716 | " ssh-keygen -e [-m key_format] [-f input_keyfile]\n" | 2716 | " ssh-keygen -e [-f input_keyfile] [-m key_format]\n" |
2717 | " ssh-keygen -y [-f input_keyfile]\n" | 2717 | " ssh-keygen -y [-f input_keyfile]\n" |
2718 | " ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n" | 2718 | " ssh-keygen -c [-C comment] [-f keyfile] [-P passphrase]\n" |
2719 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" | 2719 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
2720 | " ssh-keygen -B [-f input_keyfile]\n"); | 2720 | " ssh-keygen -B [-f input_keyfile]\n"); |
2721 | #ifdef ENABLE_PKCS11 | 2721 | #ifdef ENABLE_PKCS11 |
@@ -2729,21 +2729,21 @@ usage(void) | |||
2729 | " ssh-keygen -r hostname [-g] [-f input_keyfile]\n" | 2729 | " ssh-keygen -r hostname [-g] [-f input_keyfile]\n" |
2730 | #ifdef WITH_OPENSSL | 2730 | #ifdef WITH_OPENSSL |
2731 | " ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" | 2731 | " ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" |
2732 | " ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n" | 2732 | " ssh-keygen -f input_file -T output_file [-v] [-a rounds] [-J num_lines]\n" |
2733 | " [-j start_line] [-K checkpt] [-W generator]\n" | 2733 | " [-j start_line] [-K checkpt] [-W generator]\n" |
2734 | #endif | 2734 | #endif |
2735 | " ssh-keygen -s ca_key -I certificate_identity [-hU]\n" | 2735 | " ssh-keygen -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider]\n" |
2736 | " [-D pkcs11_provider] [-n principals] [-O option]\n" | 2736 | " [-n principals] [-O option] [-V validity_interval]\n" |
2737 | " [-V validity_interval] [-z serial_number] file ...\n" | 2737 | " [-z serial_number] file ...\n" |
2738 | " ssh-keygen -L [-f input_keyfile]\n" | 2738 | " ssh-keygen -L [-f input_keyfile]\n" |
2739 | " ssh-keygen -A\n" | 2739 | " ssh-keygen -A [-f prefix_path]\n" |
2740 | " ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" | 2740 | " ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" |
2741 | " file ...\n" | 2741 | " file ...\n" |
2742 | " ssh-keygen -Q -f krl_file file ...\n" | 2742 | " ssh-keygen -Q -f krl_file file ...\n" |
2743 | " ssh-keygen -Y sign -f sign_key -n namespace\n" | 2743 | " ssh-keygen -Y check-novalidate -n namespace -s signature_file\n" |
2744 | " ssh-keygen -Y verify -I signer_identity -s signature_file\n" | 2744 | " ssh-keygen -Y sign -f key_file -n namespace file ...\n" |
2745 | " -n namespace -f allowed_keys [-r revoked_keys]\n" | 2745 | " ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n" |
2746 | " ssh-keygen -Y check-novalidate -s signature_file -n namespace\n"); | 2746 | " -n namespace -s signature_file [-r revocation_file]\n"); |
2747 | exit(1); | 2747 | exit(1); |
2748 | } | 2748 | } |
2749 | 2749 | ||