[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.95 and 1.96

version 1.95, 2010/06/29 23:15:30 version 1.96, 2010/06/30 07:24:25
Line 222 
Line 222 
 option.  option.
 The default export format is  The default export format is
 .Dq RFC4716 .  .Dq RFC4716 .
 This option allows exporting OpenSSH key for use by other programs, including  This option allows exporting OpenSSH keys for use by other programs, including
 several commercial SSH implementations.  several commercial SSH implementations.
 .It Fl F Ar hostname  .It Fl F Ar hostname
 Search for the specified  Search for the specified
Line 293 
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 memory
   Specify the amount of memory to use (in megabytes) when generating
   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 the
 .Fl i  .Fl i
 (import) or  (import) or
 .Fl e  .Fl e
 (export) coversion options.  (export) conversion options.
 The supported key formats are:  The supported key formats are:
 .Dq RFC4716  .Dq RFC4716
 (RFC4716/SSH2 public or private key),  (RFC 4716/SSH2 public or private key),
 .Dq PKCS8  .Dq PKCS8
 (PEM PKCS8 public key)  (PEM PKCS8 public key)
 or  or
Line 309 
Line 312 
 (PEM public key).  (PEM public key).
 The default conversion format is  The default conversion format is
 .Dq RFC4716 .  .Dq RFC4716 .
 .It Fl M Ar memory  
 Specify the amount of memory to use (in megabytes) when generating  
 candidate moduli for DH-GEX.  
 .It Fl N Ar new_passphrase  .It Fl N Ar new_passphrase
 Provides the new passphrase.  Provides the new passphrase.
 .It Fl n Ar principals  .It Fl n Ar principals
Legend:
Removed from v.1.95  
changed lines
  Added in v.1.96