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 6157 by maya, Thu Nov 19 08:35:26 2015 UTC revision 6263 by doda, Mon Jan 18 09:24:32 2016 UTC
# Line 390  typedef enum { Line 390  typedef enum {
390          KEX_ECDH_SHA2_256,          KEX_ECDH_SHA2_256,
391          KEX_ECDH_SHA2_384,          KEX_ECDH_SHA2_384,
392          KEX_ECDH_SHA2_521,          KEX_ECDH_SHA2_521,
393            KEX_DH_GRP14_SHA256,
394            KEX_DH_GRP15_SHA256,
395            KEX_DH_GRP16_SHA256,
396          KEX_DH_UNKNOWN,          KEX_DH_UNKNOWN,
397          KEX_DH_MAX = KEX_DH_UNKNOWN,          KEX_DH_MAX = KEX_DH_UNKNOWN,
398  } kex_algorithm;  } kex_algorithm;
# Line 408  static ssh2_kex_algorithm_t ssh2_kex_alg Line 411  static ssh2_kex_algorithm_t ssh2_kex_alg
411          {KEX_ECDH_SHA2_256, "ecdh-sha2-nistp256",                   EVP_sha256}, // RFC5656          {KEX_ECDH_SHA2_256, "ecdh-sha2-nistp256",                   EVP_sha256}, // RFC5656
412          {KEX_ECDH_SHA2_384, "ecdh-sha2-nistp384",                   EVP_sha384}, // RFC5656          {KEX_ECDH_SHA2_384, "ecdh-sha2-nistp384",                   EVP_sha384}, // RFC5656
413          {KEX_ECDH_SHA2_521, "ecdh-sha2-nistp521",                   EVP_sha512}, // RFC5656          {KEX_ECDH_SHA2_521, "ecdh-sha2-nistp521",                   EVP_sha512}, // RFC5656
414            {KEX_DH_GRP14_SHA256, "diffie-hellman-group14-sha256",      EVP_sha256}, // draft-baushke-ssh-dh-group-sha2-01
415            {KEX_DH_GRP15_SHA256, "diffie-hellman-group15-sha256",      EVP_sha256}, // draft-baushke-ssh-dh-group-sha2-01
416            {KEX_DH_GRP16_SHA256, "diffie-hellman-group16-sha256",      EVP_sha256}, // draft-baushke-ssh-dh-group-sha2-01
417          {KEX_DH_NONE      , NULL,                                   NULL},          {KEX_DH_NONE      , NULL,                                   NULL},
418  };  };
419    

Legend:
Removed from v.6157  
changed lines
  Added in v.6263

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