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 4592 by maya, Sun Aug 21 13:44:23 2011 UTC revision 4600 by maya, Sun Aug 28 14:02:55 2011 UTC
# Line 358  typedef enum { Line 358  typedef enum {
358          HMAC_SHA1_96,          HMAC_SHA1_96,
359          HMAC_MD5_96,          HMAC_MD5_96,
360          HMAC_RIPEMD160,          HMAC_RIPEMD160,
 #ifdef WITH_HMAC_SHA2_DRAFT     // HMAC-SHA2 support  
361          HMAC_SHA2_256,          HMAC_SHA2_256,
362          HMAC_SHA2_256_96,          HMAC_SHA2_256_96,
363          HMAC_SHA2_512,          HMAC_SHA2_512,
364          HMAC_SHA2_512_96,          HMAC_SHA2_512_96,
 #endif  // HMAC-SHA2 support  
365          HMAC_UNKNOWN,          HMAC_UNKNOWN,
366          HMAC_MAX = HMAC_UNKNOWN,          HMAC_MAX = HMAC_UNKNOWN,
367  } hmac_type;  } hmac_type;
# Line 381  static ssh2_mac_t ssh2_macs[] = { Line 379  static ssh2_mac_t ssh2_macs[] = {
379          {HMAC_SHA1_96,     "hmac-sha1-96",               EVP_sha1,      96}, // RFC4253          {HMAC_SHA1_96,     "hmac-sha1-96",               EVP_sha1,      96}, // RFC4253
380          {HMAC_MD5_96,      "hmac-md5-96",                EVP_md5,       96}, // RFC4253          {HMAC_MD5_96,      "hmac-md5-96",                EVP_md5,       96}, // RFC4253
381          {HMAC_RIPEMD160,   "hmac-ripemd160@openssh.com", EVP_ripemd160, 0},          {HMAC_RIPEMD160,   "hmac-ripemd160@openssh.com", EVP_ripemd160, 0},
 #ifdef WITH_HMAC_SHA2_DRAFT     // HMAC-SHA2 support  
382          {HMAC_SHA2_256,    "hmac-sha2-256",              EVP_sha256,    0},  // draft-dbider-sha2-mac-for-ssh-02          {HMAC_SHA2_256,    "hmac-sha2-256",              EVP_sha256,    0},  // draft-dbider-sha2-mac-for-ssh-02
383          {HMAC_SHA2_256_96, "hmac-sha2-256-96",           EVP_sha256,    96}, // draft-dbider-sha2-mac-for-ssh-02          {HMAC_SHA2_256_96, "hmac-sha2-256-96",           EVP_sha256,    96}, // draft-dbider-sha2-mac-for-ssh-02
384          {HMAC_SHA2_512,    "hmac-sha2-512",              EVP_sha512,    0},  // draft-dbider-sha2-mac-for-ssh-02          {HMAC_SHA2_512,    "hmac-sha2-512",              EVP_sha512,    0},  // draft-dbider-sha2-mac-for-ssh-02
385          {HMAC_SHA2_512_96, "hmac-sha2-512-96",           EVP_sha512,    96}, // draft-dbider-sha2-mac-for-ssh-02          {HMAC_SHA2_512_96, "hmac-sha2-512-96",           EVP_sha512,    96}, // draft-dbider-sha2-mac-for-ssh-02
 #endif  // HMAC-SHA2 support  
386          {HMAC_NONE,        NULL,                         NULL,          0},          {HMAC_NONE,        NULL,                         NULL,          0},
387  };  };
388    

Legend:
Removed from v.4592  
changed lines
  Added in v.4600

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