[BACK]Return to ssh-keygen.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keygen.1 between version 1.94 and 1.95

version 1.94, 2010/04/16 06:47:04 version 1.95, 2010/06/29 23:15:30
Line 59 
Line 59 
 .Op Fl f Ar keyfile  .Op Fl f Ar keyfile
 .Nm ssh-keygen  .Nm ssh-keygen
 .Fl i  .Fl i
   .Op Fl m Ar key_format
 .Op Fl f Ar input_keyfile  .Op Fl f Ar input_keyfile
 .Nm ssh-keygen  .Nm ssh-keygen
 .Fl e  .Fl e
   .Op Fl m Ar key_format
 .Op Fl f Ar input_keyfile  .Op Fl f Ar input_keyfile
 .Nm ssh-keygen  .Nm ssh-keygen
 .Fl y  .Fl y
Line 215 
Line 217 
 .Ar pkcs11 .  .Ar pkcs11 .
 .It Fl e  .It Fl e
 This option will read a private or public OpenSSH key file and  This option will read a private or public OpenSSH key file and
 print the key in  print to stdout the key in one of the formats specified by the
 RFC 4716 SSH Public Key File Format  .Fl m
 to stdout.  option.
 This option allows exporting keys for use by several commercial  The default export format is
 SSH implementations.  .Dq RFC4716 .
   This option allows exporting OpenSSH key for use by other programs, including
   several commercial SSH implementations.
 .It Fl F Ar hostname  .It Fl F Ar hostname
 Search for the specified  Search for the specified
 .Ar hostname  .Ar hostname
Line 270 
Line 274 
 section for details.  section for details.
 .It Fl i  .It Fl i
 This option will read an unencrypted private (or public) key file  This option will read an unencrypted private (or public) key file
 in SSH2-compatible format and print an OpenSSH compatible private  in the format specified by the
   .Fl m
   option and print an OpenSSH compatible private
 (or public) key to stdout.  (or public) key to stdout.
 .Nm  This option allows importing keys from other software, including several
 also reads the  commercial SSH implementations.
 RFC 4716 SSH Public Key File Format.  The default import format is
 This option allows importing keys from several commercial  .Dq RFC4716 .
 SSH implementations.  
 .It Fl L  .It Fl L
 Prints the contents of a certificate.  Prints the contents of a certificate.
 .It Fl l  .It Fl l
Line 288 
Line 293 
 If combined with  If combined with
 .Fl v ,  .Fl v ,
 an ASCII art representation of the key is supplied with the fingerprint.  an ASCII art representation of the key is supplied with the fingerprint.
   .It Fl m Ar key_format
   Specify a key format for the
   .Fl i
   (import) or
   .Fl e
   (export) coversion options.
   The supported key formats are:
   .Dq RFC4716
   (RFC4716/SSH2 public or private key),
   .Dq PKCS8
   (PEM PKCS8 public key)
   or
   .Dq PEM
   (PEM public key).
   The default conversion format is
   .Dq RFC4716 .
 .It Fl M Ar memory  .It Fl M Ar memory
 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.
Legend:
Removed from v.1.94  
changed lines
  Added in v.1.95