[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.37 and 1.38

version 1.37, 2014/03/26 17:16:26 version 1.38, 2014/03/27 23:01:27
Line 24 
Line 24 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #define KEX_DEFAULT_KEX         \  #define KEX_SERVER_KEX          \
         "curve25519-sha256@libssh.org," \          "curve25519-sha256@libssh.org," \
         "ecdh-sha2-nistp256," \          "ecdh-sha2-nistp256," \
         "ecdh-sha2-nistp384," \          "ecdh-sha2-nistp384," \
         "ecdh-sha2-nistp521," \          "ecdh-sha2-nistp521," \
         "diffie-hellman-group-exchange-sha256," \          "diffie-hellman-group-exchange-sha256," \
           "diffie-hellman-group14-sha1" \
   
   #define KEX_CLIENT_KEX KEX_SERVER_KEX "," \
         "diffie-hellman-group-exchange-sha1," \          "diffie-hellman-group-exchange-sha1," \
         "diffie-hellman-group14-sha1," \  
         "diffie-hellman-group1-sha1"          "diffie-hellman-group1-sha1"
   
 #define KEX_DEFAULT_PK_ALG      \  #define KEX_DEFAULT_PK_ALG      \
Line 50 
Line 52 
         "ssh-rsa," \          "ssh-rsa," \
         "ssh-dss"          "ssh-dss"
   
 #define KEX_DEFAULT_ENCRYPT \  #define KEX_SERVER_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"
   
   #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
           "arcfour256,arcfour128," \
         "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \          "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
         "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"          "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
 #define KEX_DEFAULT_MAC \  
         "hmac-md5-etm@openssh.com," \  #define KEX_SERVER_MAC \
         "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," \
           "umac-64@openssh.com," \
           "umac-128@openssh.com," \
           "hmac-sha2-256," \
           "hmac-sha2-512" \
   
   #define KEX_CLIENT_MAC KEX_SERVER_MAC "," \
           "hmac-md5-etm@openssh.com," \
           "hmac-sha1-etm@openssh.com," \
         "hmac-ripemd160-etm@openssh.com," \          "hmac-ripemd160-etm@openssh.com," \
         "hmac-sha1-96-etm@openssh.com," \          "hmac-sha1-96-etm@openssh.com," \
         "hmac-md5-96-etm@openssh.com," \          "hmac-md5-96-etm@openssh.com," \
         "hmac-md5," \          "hmac-md5," \
         "hmac-sha1," \          "hmac-sha1," \
         "umac-64@openssh.com," \  
         "umac-128@openssh.com," \  
         "hmac-sha2-256," \  
         "hmac-sha2-512," \  
         "hmac-ripemd160," \          "hmac-ripemd160," \
         "hmac-ripemd160@openssh.com," \          "hmac-ripemd160@openssh.com," \
         "hmac-sha1-96," \          "hmac-sha1-96," \
Line 81 
Line 88 
 #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        ""
   
   #define KEX_CLIENT \
           KEX_CLIENT_KEX, \
           KEX_DEFAULT_PK_ALG, \
           KEX_CLIENT_ENCRYPT, \
           KEX_CLIENT_ENCRYPT, \
           KEX_CLIENT_MAC, \
           KEX_CLIENT_MAC, \
           KEX_DEFAULT_COMP, \
           KEX_DEFAULT_COMP, \
           KEX_DEFAULT_LANG, \
           KEX_DEFAULT_LANG
   
 static char *myproposal[PROPOSAL_MAX] = {  #define KEX_SERVER \
         KEX_DEFAULT_KEX,          KEX_SERVER_KEX, \
         KEX_DEFAULT_PK_ALG,          KEX_DEFAULT_PK_ALG, \
         KEX_DEFAULT_ENCRYPT,          KEX_SERVER_ENCRYPT, \
         KEX_DEFAULT_ENCRYPT,          KEX_SERVER_ENCRYPT, \
         KEX_DEFAULT_MAC,          KEX_SERVER_MAC, \
         KEX_DEFAULT_MAC,          KEX_SERVER_MAC, \
         KEX_DEFAULT_COMP,          KEX_DEFAULT_COMP, \
         KEX_DEFAULT_COMP,          KEX_DEFAULT_COMP, \
         KEX_DEFAULT_LANG,          KEX_DEFAULT_LANG, \
         KEX_DEFAULT_LANG          KEX_DEFAULT_LANG
 };  
Legend:
Removed from v.1.37  
changed lines
  Added in v.1.38