diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-22 12:40:42 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-22 12:42:02 +0100 |
| commit | ecd2f33cb772db4fa76776543599f1c1ab6f9fa0 (patch) | |
| tree | 56e09f98bbcbfa8f7d816f67ea277bef2a473a23 | |
| parent | upstream: print the full pubkey being attempted at loglevel >= (diff) | |
| download | openssh-ecd2f33cb772db4fa76776543599f1c1ab6f9fa0.tar.xz openssh-ecd2f33cb772db4fa76776543599f1c1ab6f9fa0.zip | |
upstream: Include -m in the synopsis for a few more commands that
support it
Be more explicit in the description of -m about where it may be used
Prompted by Jakub Jelen in bz2904
OpenBSD-Commit-ID: 3b398ac5e05d8a6356710d0ff114536c9d71046c
Diffstat (limited to '')
| -rw-r--r-- | ssh-keygen.1 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index d538816d9..474f4294a 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.154 2019/01/22 11:19:42 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.155 2019/01/22 11:40:42 djm Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -50,11 +50,13 @@ .Op Fl N Ar new_passphrase .Op Fl C Ar comment .Op Fl f Ar output_keyfile +.Op Fl m Ar format .Nm ssh-keygen .Fl p .Op Fl P Ar old_passphrase .Op Fl N Ar new_passphrase .Op Fl f Ar keyfile +.Op Fl m Ar format .Nm ssh-keygen .Fl i .Op Fl m Ar key_format @@ -404,11 +406,15 @@ fingerprint. Specify the amount of memory to use (in megabytes) when generating candidate moduli for DH-GEX. .It Fl m Ar key_format -Specify a key format for the +Specify a key format for key generation, the .Fl i -(import) or +(import), .Fl e -(export) conversion options. +(export) conversion options, and the +.Fl p +change passphrase operation. +The latter may be used to convert between OpenSSH private key and PEM +private key formats. The supported key formats are: .Dq RFC4716 (RFC 4716/SSH2 public or private key), |