Develop and Download Open Source Software

Browse Subversion Repository

Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c

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

revision 4435 by doda, Mon Apr 11 00:55:18 2011 UTC revision 4438 by maya, Mon Apr 11 03:25:46 2011 UTC
# Line 306  static void normalize_host_key_order(cha Line 306  static void normalize_host_key_order(cha
306  static void normalize_mac_order(char FAR * buf)  static void normalize_mac_order(char FAR * buf)
307  {  {
308          static char default_strings[] = {          static char default_strings[] = {
309  #ifdef HMAC_SHA2_DRAFT  // HMAC-SHA2 support  #ifdef WITH_HMAC_SHA2_DRAFT     // HMAC-SHA2 support
310                  HMAC_SHA2_512,                  HMAC_SHA2_512,
311                  HMAC_SHA2_256,                  HMAC_SHA2_256,
312  #endif  // HMAC-SHA2 support  #endif  // HMAC-SHA2 support
# Line 314  static void normalize_mac_order(char FAR Line 314  static void normalize_mac_order(char FAR
314                  HMAC_RIPEMD160,                  HMAC_RIPEMD160,
315                  HMAC_MD5,                  HMAC_MD5,
316                  HMAC_NONE,                  HMAC_NONE,
317  #ifdef HMAC_SHA2_DRAFT  // HMAC-SHA2 support  #ifdef WITH_HMAC_SHA2_DRAFT     // HMAC-SHA2 support
318                  HMAC_SHA2_512_96,                  HMAC_SHA2_512_96,
319                  HMAC_SHA2_256_96,                  HMAC_SHA2_256_96,
320  #endif  // HMAC-SHA2 support  #endif  // HMAC-SHA2 support
# Line 2298  static void init_about_dlg(PTInstVar pva Line 2298  static void init_about_dlg(PTInstVar pva
2298          get_file_version("ttxssh.dll", &a, &b, &c, &d);          get_file_version("ttxssh.dll", &a, &b, &c, &d);
2299          _snprintf_s(buf, sizeof(buf), _TRUNCATE,          _snprintf_s(buf, sizeof(buf), _TRUNCATE,
2300  #ifdef WITH_CAMELLIA_DRAFT  #ifdef WITH_CAMELLIA_DRAFT
2301  #ifdef HMAC_SHA2_DRAFT  #ifdef WITH_HMAC_SHA2_DRAFT
2302  //              "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia/HMAC-SHA2", a, b);  //              "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia/HMAC-SHA2", a, b);
2303                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d (Camellia/HMAC-SHA2)", a, b);                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d (Camellia/HMAC-SHA2)", a, b);
2304  #else  #else
2305                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia support", a, b);                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia support", a, b);
2306  #endif  #endif
2307  #else  #else
2308  #ifdef HMAC_SHA2_DRAFT  #ifdef WITH_HMAC_SHA2_DRAFT
2309                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d with HMAC-SHA2 support", a, b);                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d with HMAC-SHA2 support", a, b);
2310  #else  #else
2311                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);

Legend:
Removed from v.4435  
changed lines
  Added in v.4438

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