summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.116
1 files changed, 8 insertions, 8 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0d62255ba..76ce88ca5 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.95 2010/06/29 23:15:30 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.96 2010/06/30 07:24:25 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: June 29 2010 $ 40.Dd $Mdocdate: June 30 2010 $
41.Dt SSH-KEYGEN 1 41.Dt SSH-KEYGEN 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -222,7 +222,7 @@ print to stdout the key in one of the formats specified by the
222option. 222option.
223The default export format is 223The default export format is
224.Dq RFC4716 . 224.Dq RFC4716 .
225This option allows exporting OpenSSH key for use by other programs, including 225This option allows exporting OpenSSH keys for use by other programs, including
226several commercial SSH implementations. 226several commercial SSH implementations.
227.It Fl F Ar hostname 227.It Fl F Ar hostname
228Search for the specified 228Search for the specified
@@ -293,15 +293,18 @@ tries to find the matching public key file and prints its fingerprint.
293If combined with 293If combined with
294.Fl v , 294.Fl v ,
295an ASCII art representation of the key is supplied with the fingerprint. 295an ASCII art representation of the key is supplied with the fingerprint.
296.It Fl M Ar memory
297Specify the amount of memory to use (in megabytes) when generating
298candidate moduli for DH-GEX.
296.It Fl m Ar key_format 299.It Fl m Ar key_format
297Specify a key format for the 300Specify a key format for the
298.Fl i 301.Fl i
299(import) or 302(import) or
300.Fl e 303.Fl e
301(export) coversion options. 304(export) conversion options.
302The supported key formats are: 305The supported key formats are:
303.Dq RFC4716 306.Dq RFC4716
304(RFC4716/SSH2 public or private key), 307(RFC 4716/SSH2 public or private key),
305.Dq PKCS8 308.Dq PKCS8
306(PEM PKCS8 public key) 309(PEM PKCS8 public key)
307or 310or
@@ -309,9 +312,6 @@ or
309(PEM public key). 312(PEM public key).
310The default conversion format is 313The default conversion format is
311.Dq RFC4716 . 314.Dq RFC4716 .
312.It Fl M Ar memory
313Specify the amount of memory to use (in megabytes) when generating
314candidate moduli for DH-GEX.
315.It Fl N Ar new_passphrase 315.It Fl N Ar new_passphrase
316Provides the new passphrase. 316Provides the new passphrase.
317.It Fl n Ar principals 317.It Fl n Ar principals