[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.185 and 1.186

version 1.185, 2014/02/23 20:11:36 version 1.186, 2014/03/28 05:17:11
Line 342 
Line 342 
 Multiple ciphers must be comma-separated.  Multiple ciphers must be comma-separated.
 The supported ciphers are:  The supported ciphers are:
 .Pp  .Pp
 .Dq 3des-cbc ,  .Bl -item -compact -offset indent
 .Dq aes128-cbc ,  .It
 .Dq aes192-cbc ,  3des-cbc
 .Dq aes256-cbc ,  .It
 .Dq aes128-ctr ,  aes128-cbc
 .Dq aes192-ctr ,  .It
 .Dq aes256-ctr ,  aes192-cbc
 .Dq aes128-gcm@openssh.com ,  .It
 .Dq aes256-gcm@openssh.com ,  aes256-cbc
 .Dq arcfour128 ,  .It
 .Dq arcfour256 ,  aes128-ctr
 .Dq arcfour ,  .It
 .Dq blowfish-cbc ,  aes192-ctr
 .Dq cast128-cbc ,  .It
 and  aes256-ctr
 .Dq chacha20-poly1305@openssh.com .  .It
   aes128-gcm@openssh.com
   .It
   aes256-gcm@openssh.com
   .It
   arcfour
   .It
   arcfour128
   .It
   arcfour256
   .It
   blowfish-cbc
   .It
   cast128-cbc
   .It
   chacha20-poly1305@openssh.com
   .El
 .Pp  .Pp
 The default is:  The default is:
 .Bd -literal -offset 3n  .Bd -literal -offset indent
 aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,  aes128-ctr,aes192-ctr,aes256-ctr,
 aes128-gcm@openssh.com,aes256-gcm@openssh.com,  aes128-gcm@openssh.com,aes256-gcm@openssh.com,
 chacha20-poly1305@openssh.com,  chacha20-poly1305@openssh.com,
 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,  arcfour256,arcfour128,
 aes256-cbc,arcfour  aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
   aes192-cbc,aes256-cbc,arcfour
 .Ed  .Ed
 .Pp  .Pp
 The list of available ciphers may also be obtained using the  The list of available ciphers may also be obtained using the
Line 893 
Line 910 
 curve25519-sha256@libssh.org,  curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,  ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
 diffie-hellman-group-exchange-sha256,  diffie-hellman-group-exchange-sha256,
 diffie-hellman-group-exchange-sha1,  
 diffie-hellman-group14-sha1,  diffie-hellman-group14-sha1,
   diffie-hellman-group-exchange-sha1,
 diffie-hellman-group1-sha1  diffie-hellman-group1-sha1
 .Ed  .Ed
 .It Cm LocalCommand  .It Cm LocalCommand
Line 974 
Line 991 
 These are considered safer and their use recommended.  These are considered safer and their use recommended.
 The default is:  The default is:
 .Bd -literal -offset indent  .Bd -literal -offset indent
 hmac-md5-etm@openssh.com,hmac-sha1-etm@openssh.com,  
 umac-64-etm@openssh.com,umac-128-etm@openssh.com,  umac-64-etm@openssh.com,umac-128-etm@openssh.com,
 hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,  hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
 hmac-ripemd160-etm@openssh.com,hmac-sha1-96-etm@openssh.com,  umac-64@openssh.com,umac-128@openssh.com,
 hmac-md5-96-etm@openssh.com,  hmac-sha2-256,hmac-sha2-512,
 hmac-md5,hmac-sha1,umac-64@openssh.com,umac-128@openssh.com,  hmac-md5-etm@openssh.com,hmac-sha1-etm@openssh.com,
 hmac-sha2-256,hmac-sha2-512,hmac-ripemd160,  hmac-ripemd160-etm@openssh.com,
   hmac-sha1-96-etm@openssh.com,hmac-md5-96-etm@openssh.com,
   hmac-md5,hmac-sha1,hmac-ripemd160,
 hmac-sha1-96,hmac-md5-96  hmac-sha1-96,hmac-md5-96
 .Ed  .Ed
 .It Cm NoHostAuthenticationForLocalhost  .It Cm NoHostAuthenticationForLocalhost

Legend:
Removed from v.1.185  
changed lines
  Added in v.1.186