[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.35 and 1.36

version 1.35, 2013/12/06 13:39:49 version 1.36, 2014/03/25 09:40:03
Line 30 
Line 30 
         "ecdh-sha2-nistp384," \          "ecdh-sha2-nistp384," \
         "ecdh-sha2-nistp521," \          "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-group1-sha1"  
   
 #define KEX_DEFAULT_PK_ALG      \  #define KEX_DEFAULT_PK_ALG      \
         "ecdsa-sha2-nistp256-cert-v01@openssh.com," \          "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
Line 52 
Line 50 
   
 #define KEX_DEFAULT_ENCRYPT \  #define KEX_DEFAULT_ENCRYPT \
         "aes128-ctr,aes192-ctr,aes256-ctr," \          "aes128-ctr,aes192-ctr,aes256-ctr," \
         "arcfour256,arcfour128," \  
         "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,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"  
 #define KEX_DEFAULT_MAC \  #define KEX_DEFAULT_MAC \
         "hmac-md5-etm@openssh.com," \  
         "hmac-sha1-etm@openssh.com," \  
         "umac-64-etm@openssh.com," \          "umac-64-etm@openssh.com," \
         "umac-128-etm@openssh.com," \          "umac-128-etm@openssh.com," \
         "hmac-sha2-256-etm@openssh.com," \          "hmac-sha2-256-etm@openssh.com," \
         "hmac-sha2-512-etm@openssh.com," \          "hmac-sha2-512-etm@openssh.com," \
         "hmac-ripemd160-etm@openssh.com," \  
         "hmac-sha1-96-etm@openssh.com," \  
         "hmac-md5-96-etm@openssh.com," \  
         "hmac-md5," \  
         "hmac-sha1," \  
         "umac-64@openssh.com," \          "umac-64@openssh.com," \
         "umac-128@openssh.com," \          "umac-128@openssh.com," \
         "hmac-sha2-256," \          "hmac-sha2-256," \
         "hmac-sha2-512," \          "hmac-sha2-512" \
         "hmac-ripemd160," \  
         "hmac-ripemd160@openssh.com," \  
         "hmac-sha1-96," \  
         "hmac-md5-96"  
   
 #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"  #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"
 #define KEX_DEFAULT_LANG        ""  #define KEX_DEFAULT_LANG        ""
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36