Develop and Download Open Source Software

Browse Subversion Repository

Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4152 by yutakapon, Wed Nov 10 16:15:13 2010 UTC revision 4299 by maya, Wed Feb 9 16:00:36 2011 UTC
# Line 195  enum channel_type { Line 195  enum channel_type {
195  #define SSH2_OPEN_RESOURCE_SHORTAGE              4  #define SSH2_OPEN_RESOURCE_SHORTAGE              4
196    
197  // キー交換アルゴリズム  // キー交換アルゴリズム
198  #define KEX_DH1     "diffie-hellman-group1-sha1"  #define KEX_DH1             "diffie-hellman-group1-sha1"
199  #define KEX_DH14    "diffie-hellman-group14-sha1"  #define KEX_DH14            "diffie-hellman-group14-sha1"
200  #define KEX_DHGEX   "diffie-hellman-group-exchange-sha1"  #define KEX_DHGEX_SHA1      "diffie-hellman-group-exchange-sha1"
201    #define KEX_DHGEX_SHA256    "diffie-hellman-group-exchange-sha256"
202    
203  // support of "Compression delayed" (2006.6.23 maya)  // support of "Compression delayed" (2006.6.23 maya)
204  enum compression_type {  enum compression_type {
# Line 211  enum kex_exchange { Line 212  enum kex_exchange {
212          KEX_DH_GRP1_SHA1,          KEX_DH_GRP1_SHA1,
213          KEX_DH_GRP14_SHA1,          KEX_DH_GRP14_SHA1,
214          KEX_DH_GEX_SHA1,          KEX_DH_GEX_SHA1,
215            KEX_DH_GEX_SHA256,
216          KEX_MAX          KEX_MAX
217  };  };
218    
# Line 228  enum hmac_type { Line 230  enum hmac_type {
230          HMAC_UNKNOWN          HMAC_UNKNOWN
231  };  };
232    
233  #define KEX_DEFAULT_KEX     "diffie-hellman-group-exchange-sha1," \  #define KEX_DEFAULT_KEX     "diffie-hellman-group-exchange-sha256," \
234                                "diffie-hellman-group-exchange-sha1," \
235                              "diffie-hellman-group14-sha1," \                              "diffie-hellman-group14-sha1," \
236                              "diffie-hellman-group1-sha1"                              "diffie-hellman-group1-sha1"
237  #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"  #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"
# Line 265  enum kex_init_proposals { Line 268  enum kex_init_proposals {
268  #ifdef SSH2_DEBUG  #ifdef SSH2_DEBUG
269  static char *myproposal[PROPOSAL_MAX] = {  static char *myproposal[PROPOSAL_MAX] = {
270  //      KEX_DEFAULT_KEX,  //      KEX_DEFAULT_KEX,
271          "diffie-hellman-group14-sha1,diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1",          "diffie-hellman-group14-sha1,diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group-exchange-sha256",
272          KEX_DEFAULT_PK_ALG,          KEX_DEFAULT_PK_ALG,
273  //      "ssh-dss,ssh-rsa",  //      "ssh-dss,ssh-rsa",
274          KEX_DEFAULT_ENCRYPT,          KEX_DEFAULT_ENCRYPT,

Legend:
Removed from v.4152  
changed lines
  Added in v.4299

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26