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

Diff for /src/usr.bin/ssh/myproposal.h between version 1.49 and 1.50

version 1.49, 2015/12/05 20:53:21 version 1.50, 2016/02/09 05:30:04
Line 60 
Line 60 
         "aes128-gcm@openssh.com,aes256-gcm@openssh.com"          "aes128-gcm@openssh.com,aes256-gcm@openssh.com"
   
 #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \  #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
         "arcfour256,arcfour128," \          "aes128-cbc,aes192-cbc,aes256-cbc,3des-cbc"
         "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \  
         "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"  
   
 #define KEX_SERVER_MAC \  #define KEX_SERVER_MAC \
         "umac-64-etm@openssh.com," \          "umac-64-etm@openssh.com," \
Line 76 
Line 74 
         "hmac-sha2-512," \          "hmac-sha2-512," \
         "hmac-sha1"          "hmac-sha1"
   
 #define KEX_CLIENT_MAC KEX_SERVER_MAC "," \  #define KEX_CLIENT_MAC KEX_SERVER_MAC
         "hmac-md5-etm@openssh.com," \  
         "hmac-ripemd160-etm@openssh.com," \  
         "hmac-sha1-96-etm@openssh.com," \  
         "hmac-md5-96-etm@openssh.com," \  
         "hmac-md5," \  
         "hmac-ripemd160," \  
         "hmac-ripemd160@openssh.com," \  
         "hmac-sha1-96," \  
         "hmac-md5-96"  
   
 #else  #else /* WITH_OPENSSL */
   
 #define KEX_SERVER_KEX          \  #define KEX_SERVER_KEX          \
         "curve25519-sha256@libssh.org"          "curve25519-sha256@libssh.org"
Legend:
Removed from v.1.49  
changed lines
  Added in v.1.50