[BACK]Return to ssh_config.5 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh_config.5 between version 1.138 and 1.139

version 1.138, 2010/08/04 05:37:01 version 1.139, 2010/08/31 11:54:45
Line 547 
Line 547 
 Specifies the protocol version 2 host key algorithms  Specifies the protocol version 2 host key algorithms
 that the client wants to use in order of preference.  that the client wants to use in order of preference.
 The default for this option is:  The default for this option is:
 .Dq ssh-rsa,ssh-dss .  .Bd -literal -offset 3n
   ecdsa-sha2-nistp256-cert-v01@openssh.com,
   ecdsa-sha2-nistp384-cert-v01@openssh.com,
   ecdsa-sha2-nistp521-cert-v01@openssh.com,
   ssh-rsa-cert-v01@openssh.com,ssh-dss-cert-v01@openssh.com,
   ssh-rsa-cert-v00@openssh.com,ssh-dss-cert-v00@openssh.com,
   ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
   ssh-rsa,ssh-dss
   .Ed
 .It Cm HostKeyAlias  .It Cm HostKeyAlias
 Specifies an alias that should be used instead of the  Specifies an alias that should be used instead of the
 real host name when looking up or saving the host key  real host name when looking up or saving the host key
Line 583 
Line 591 
 The default is  The default is
 .Dq no .  .Dq no .
 .It Cm IdentityFile  .It Cm IdentityFile
 Specifies a file from which the user's RSA or DSA authentication identity  Specifies a file from which the user's DSA, ECDSA or DSA authentication
 is read.  identity is read.
 The default is  The default is
 .Pa ~/.ssh/identity  .Pa ~/.ssh/identity
 for protocol version 1, and  for protocol version 1, and
 .Pa ~/.ssh/id_rsa  .Pa ~/.ssh/id_dsa ,
   .Pa ~/.ssh/id_ecdsa
 and  and
 .Pa ~/.ssh/id_dsa  .Pa ~/.ssh/id_rsa
 for protocol version 2.  for protocol version 2.
 Additionally, any identities represented by the authentication agent  Additionally, any identities represented by the authentication agent
 will be used for authentication.  will be used for authentication.

Legend:
Removed from v.1.138  
changed lines
  Added in v.1.139