diff options
-rw-r--r-- | ssh-keygen.1 | 12 | ||||
-rw-r--r-- | ssh-keygen.c | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 5d499fc5e..637dd4231 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.169 2019/09/27 20:03:24 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.170 2019/09/29 16:31:57 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,7 +35,7 @@ | |||
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 27 2019 $ | 38 | .Dd $Mdocdate: September 29 2019 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -85,9 +85,8 @@ | |||
85 | .Fl D Ar pkcs11 | 85 | .Fl D Ar pkcs11 |
86 | .Nm ssh-keygen | 86 | .Nm ssh-keygen |
87 | .Fl F Ar hostname | 87 | .Fl F Ar hostname |
88 | .Op Fl lv | ||
88 | .Op Fl f Ar known_hosts_file | 89 | .Op Fl f Ar known_hosts_file |
89 | .Op Fl l | ||
90 | .Op Fl v | ||
91 | .Nm ssh-keygen | 90 | .Nm ssh-keygen |
92 | .Fl H | 91 | .Fl H |
93 | .Op Fl f Ar known_hosts_file | 92 | .Op Fl f Ar known_hosts_file |
@@ -96,8 +95,8 @@ | |||
96 | .Op Fl f Ar known_hosts_file | 95 | .Op Fl f Ar known_hosts_file |
97 | .Nm ssh-keygen | 96 | .Nm ssh-keygen |
98 | .Fl r Ar hostname | 97 | .Fl r Ar hostname |
99 | .Op Fl f Ar input_keyfile | ||
100 | .Op Fl g | 98 | .Op Fl g |
99 | .Op Fl f Ar input_keyfile | ||
101 | .Nm ssh-keygen | 100 | .Nm ssh-keygen |
102 | .Fl G Ar output_file | 101 | .Fl G Ar output_file |
103 | .Op Fl v | 102 | .Op Fl v |
@@ -116,8 +115,7 @@ | |||
116 | .Nm ssh-keygen | 115 | .Nm ssh-keygen |
117 | .Fl s Ar ca_key | 116 | .Fl s Ar ca_key |
118 | .Fl I Ar certificate_identity | 117 | .Fl I Ar certificate_identity |
119 | .Op Fl h | 118 | .Op Fl hU |
120 | .Op Fl U | ||
121 | .Op Fl D Ar pkcs11_provider | 119 | .Op Fl D Ar pkcs11_provider |
122 | .Op Fl n Ar principals | 120 | .Op Fl n Ar principals |
123 | .Op Fl O Ar option | 121 | .Op Fl O Ar option |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 4b58ddaee..4ec479de7 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.351 2019/09/24 12:50:46 deraadt Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.352 2019/09/29 16:31:57 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 |
@@ -2723,16 +2723,16 @@ usage(void) | |||
2723 | " ssh-keygen -D pkcs11\n"); | 2723 | " ssh-keygen -D pkcs11\n"); |
2724 | #endif | 2724 | #endif |
2725 | fprintf(stderr, | 2725 | fprintf(stderr, |
2726 | " ssh-keygen -F hostname [-f known_hosts_file] [-l]\n" | 2726 | " ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" |
2727 | " ssh-keygen -H [-f known_hosts_file]\n" | 2727 | " ssh-keygen -H [-f known_hosts_file]\n" |
2728 | " ssh-keygen -R hostname [-f known_hosts_file]\n" | 2728 | " ssh-keygen -R hostname [-f known_hosts_file]\n" |
2729 | " ssh-keygen -r hostname [-f input_keyfile] [-g]\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 -T output_file -f input_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 [-h] [-U]\n" | 2735 | " ssh-keygen -s ca_key -I certificate_identity [-hU]\n" |
2736 | " [-D pkcs11_provider] [-n principals] [-O option]\n" | 2736 | " [-D pkcs11_provider] [-n principals] [-O option]\n" |
2737 | " [-V validity_interval] [-z serial_number] file ...\n" | 2737 | " [-V validity_interval] [-z serial_number] file ...\n" |
2738 | " ssh-keygen -L [-f input_keyfile]\n" | 2738 | " ssh-keygen -L [-f input_keyfile]\n" |