diff options
| author | jmc@openbsd.org <jmc@openbsd.org> | 2019-09-29 16:31:57 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-10-01 20:24:07 +1000 |
| commit | 6c91d42cce3f055917dc3fd2c305dfc5b3b584b3 (patch) | |
| tree | 1569d087398c7ad98f99348e547b97c2725dbba8 | |
| parent | 3b44bf39ff4d7ef5d50861e2e9dda62d2926d2fe (diff) | |
upstream: group and sort single letter options; ok deraadt
OpenBSD-Commit-ID: e1480e760a2b582f79696cdcff70098e23fc603f
| -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 5d499fc5..637dd423 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.169 2019/09/27 20:03:24 jmc Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.170 2019/09/29 16:31:57 jmc Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 27 2019 $ +.Dd $Mdocdate: September 29 2019 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -85,9 +85,8 @@ .Fl D Ar pkcs11 .Nm ssh-keygen .Fl F Ar hostname +.Op Fl lv .Op Fl f Ar known_hosts_file -.Op Fl l -.Op Fl v .Nm ssh-keygen .Fl H .Op Fl f Ar known_hosts_file @@ -96,8 +95,8 @@ .Op Fl f Ar known_hosts_file .Nm ssh-keygen .Fl r Ar hostname -.Op Fl f Ar input_keyfile .Op Fl g +.Op Fl f Ar input_keyfile .Nm ssh-keygen .Fl G Ar output_file .Op Fl v @@ -116,8 +115,7 @@ .Nm ssh-keygen .Fl s Ar ca_key .Fl I Ar certificate_identity -.Op Fl h -.Op Fl U +.Op Fl hU .Op Fl D Ar pkcs11_provider .Op Fl n Ar principals .Op Fl O Ar option diff --git a/ssh-keygen.c b/ssh-keygen.c index 4b58ddae..4ec479de 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.351 2019/09/24 12:50:46 deraadt Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.352 2019/09/29 16:31:57 jmc Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2723,16 +2723,16 @@ usage(void) " ssh-keygen -D pkcs11\n"); #endif fprintf(stderr, - " ssh-keygen -F hostname [-f known_hosts_file] [-l]\n" + " ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" " ssh-keygen -H [-f known_hosts_file]\n" " ssh-keygen -R hostname [-f known_hosts_file]\n" - " ssh-keygen -r hostname [-f input_keyfile] [-g]\n" + " ssh-keygen -r hostname [-g] [-f input_keyfile]\n" #ifdef WITH_OPENSSL " ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" " ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n" " [-j start_line] [-K checkpt] [-W generator]\n" #endif - " ssh-keygen -s ca_key -I certificate_identity [-h] [-U]\n" + " ssh-keygen -s ca_key -I certificate_identity [-hU]\n" " [-D pkcs11_provider] [-n principals] [-O option]\n" " [-V validity_interval] [-z serial_number] file ...\n" " ssh-keygen -L [-f input_keyfile]\n" |