diff options
| author |   naddy <naddy@openbsd.org> | 2020-01-14 15:07:30 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2020-01-14 15:07:30 +0000 |
| commit | 55a3ba9e17518e51084fe7e30f712cc505a1f631 (patch) | |
| tree | 31735821fe409a62e3b205950353238ad28d31d1 | |
| parent | Add live test for simple ikev2 handshake and encrypted ping between two (diff) | |
| download | wireguard-openbsd-55a3ba9e17518e51084fe7e30f712cc505a1f631.tar.xz wireguard-openbsd-55a3ba9e17518e51084fe7e30f712cc505a1f631.zip | |
sync ssh-keygen.1 and ssh-keygen's usage() with each other and reality
ok markus@
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.1 | 12 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1 index 2e98942801b..125add8f9ee 100644 --- a/usr.bin/ssh/ssh-keygen.1 +++ b/usr.bin/ssh/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.190 2020/01/06 07:43:28 jmc Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.191 2020/01/14 15:07:30 naddy 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: January 6 2020 $ +.Dd $Mdocdate: January 14 2020 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -48,9 +48,9 @@ .Op Fl C Ar comment .Op Fl f Ar output_keyfile .Op Fl m Ar format -.Op Fl O Ar option .Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa .Op Fl N Ar new_passphrase +.Op Fl O Ar option .Op Fl w Ar provider .Nm ssh-keygen .Fl p @@ -104,12 +104,12 @@ .Nm ssh-keygen .Fl M Cm generate .Op Fl O Ar option -.Ar +.Ar output_file .Nm ssh-keygen .Fl M Cm screen -.Fl f Ar input_file +.Op Fl f Ar input_file .Op Fl O Ar option -.Ar +.Ar output_file .Nm ssh-keygen .Fl I Ar certificate_identity .Fl s Ar ca_key diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 3d395566e97..ba409b9d278 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.382 2020/01/06 02:00:46 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.383 2020/01/14 15:07:30 naddy Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2991,7 +2991,7 @@ usage(void) fprintf(stderr, "usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" " [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" - " [-N new_passphrase] [-w provider] [-x flags]\n" + " [-N new_passphrase] [-O option] [-w provider]\n" " ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" " [-P old_passphrase]\n" " ssh-keygen -i [-f input_keyfile] [-m key_format]\n" @@ -3005,15 +3005,14 @@ usage(void) " ssh-keygen -D pkcs11\n"); #endif fprintf(stderr, - " ssh-keygen -K path [-w sk_provider]\n"); - fprintf(stderr, " ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" " ssh-keygen -H [-f known_hosts_file]\n" + " ssh-keygen -K [-w provider]\n" " ssh-keygen -R hostname [-f known_hosts_file]\n" " ssh-keygen -r hostname [-g] [-f input_keyfile]\n" #ifdef WITH_OPENSSL - " ssh-keygen -M generate [-O option] output\n" - " ssh-keygen -M screen [-f input_file] [-O option] [-a rounds] output_file\n" + " ssh-keygen -M generate [-O option] output_file\n" + " ssh-keygen -M screen [-f input_file] [-O option] output_file\n" #endif " ssh-keygen -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider]\n" " [-n principals] [-O option] [-V validity_interval]\n" |