[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.41 and 1.42

version 1.41, 2014/07/11 13:54:34 version 1.42, 2015/03/24 09:17:21
Line 55 
Line 55 
         "ssh-dss"          "ssh-dss"
   
 #define KEX_SERVER_ENCRYPT \  #define KEX_SERVER_ENCRYPT \
           "chacha20-poly1305@openssh.com," \
         "aes128-ctr,aes192-ctr,aes256-ctr," \          "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"  
   
 #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \  #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
         "arcfour256,arcfour128," \          "arcfour256,arcfour128," \
Line 95 
Line 95 
         "ssh-ed25519-cert-v01@openssh.com," \          "ssh-ed25519-cert-v01@openssh.com," \
         "ssh-ed25519"          "ssh-ed25519"
 #define KEX_SERVER_ENCRYPT \  #define KEX_SERVER_ENCRYPT \
         "aes128-ctr,aes192-ctr,aes256-ctr," \          "chacha20-poly1305@openssh.com,"
         "chacha20-poly1305@openssh.com"          "aes128-ctr,aes192-ctr,aes256-ctr"
 #define KEX_SERVER_MAC \  #define KEX_SERVER_MAC \
         "umac-64-etm@openssh.com," \          "umac-64-etm@openssh.com," \
         "umac-128-etm@openssh.com," \          "umac-128-etm@openssh.com," \
Legend:
Removed from v.1.41  
changed lines
  Added in v.1.42