tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Include -m in the synopsis for a few more commands that

Browse Source 
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
This commit is contained in:
djm@openbsd.org 2019-01-22 11:40:42 +00:00 committed by Damien Miller
parent ff5d2cf4ca
commit ecd2f33cb7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssh-keygen.1
View File

@ -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> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -50,11 +50,13 @@
.Op Fl N Ar new_passphrase .Op Fl N Ar new_passphrase
.Op Fl C Ar comment .Op Fl C Ar comment
.Op Fl f Ar output_keyfile .Op Fl f Ar output_keyfile
.Op Fl m Ar format
.Nm ssh-keygen .Nm ssh-keygen
.Fl p .Fl p
.Op Fl P Ar old_passphrase .Op Fl P Ar old_passphrase
.Op Fl N Ar new_passphrase .Op Fl N Ar new_passphrase
.Op Fl f Ar keyfile .Op Fl f Ar keyfile
.Op Fl m Ar format
.Nm ssh-keygen .Nm ssh-keygen
.Fl i .Fl i
.Op Fl m Ar key_format .Op Fl m Ar key_format
@ -404,11 +406,15 @@ fingerprint.
Specify the amount of memory to use (in megabytes) when generating Specify the amount of memory to use (in megabytes) when generating
candidate moduli for DH-GEX. candidate moduli for DH-GEX.
.It Fl m Ar key_format .It Fl m Ar key_format
Specify a key format for the Specify a key format for key generation, the
.Fl i .Fl i
(import) or (import),
.Fl e .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: The supported key formats are:
.Dq RFC4716 .Dq RFC4716
(RFC 4716/SSH2 public or private key), (RFC 4716/SSH2 public or private key),