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

Diff for /src/usr.bin/ssh/ssh.1 between version 1.283 and 1.284

version 1.283, 2009/03/19 15:15:09 version 1.284, 2009/10/08 20:42:12
Line 666 
Line 666 
 if an error occurred.  if an error occurred.
 .Sh AUTHENTICATION  .Sh AUTHENTICATION
 The OpenSSH SSH client supports SSH protocols 1 and 2.  The OpenSSH SSH client supports SSH protocols 1 and 2.
 Protocol 2 is the default, with  The default is to use protocol 2 only,
 .Nm  though this can be changed via the
 falling back to protocol 1 if it detects protocol 2 is unsupported.  
 These settings may be altered using the  
 .Cm Protocol  .Cm Protocol
 option in  option in
 .Xr ssh_config 5 ,  .Xr ssh_config 5
 or enforced using the  or the
 .Fl 1  .Fl 1
 and  and
 .Fl 2  .Fl 2
 options (see above).  options (see above).
 Both protocols support similar authentication methods,  Both protocols support similar authentication methods,
 but protocol 2 is preferred since  but protocol 2 is the default since
 it provides additional mechanisms for confidentiality  it provides additional mechanisms for confidentiality
 (the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour)  (the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour)
 and integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160).  and integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160).
Legend:
Removed from v.1.283  
changed lines
  Added in v.1.284