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 4586 by maya, Sat Aug 20 02:11:22 2011 UTC revision 4600 by maya, Sun Aug 28 14:02:55 2011 UTC
# Line 308  static void normalize_host_key_order(cha Line 308  static void normalize_host_key_order(cha
308  static void normalize_mac_order(char FAR * buf)  static void normalize_mac_order(char FAR * buf)
309  {  {
310          static char default_strings[] = {          static char default_strings[] = {
 #ifdef WITH_HMAC_SHA2_DRAFT     // HMAC-SHA2 support  
311                  HMAC_SHA2_512,                  HMAC_SHA2_512,
312                  HMAC_SHA2_256,                  HMAC_SHA2_256,
 #endif  // HMAC-SHA2 support  
313                  HMAC_SHA1,                  HMAC_SHA1,
314                  HMAC_RIPEMD160,                  HMAC_RIPEMD160,
315                  HMAC_MD5,                  HMAC_MD5,
316                  HMAC_NONE,                  HMAC_NONE,
 #ifdef WITH_HMAC_SHA2_DRAFT     // HMAC-SHA2 support  
317                  HMAC_SHA2_512_96,                  HMAC_SHA2_512_96,
318                  HMAC_SHA2_256_96,                  HMAC_SHA2_256_96,
 #endif  // HMAC-SHA2 support  
319                  HMAC_SHA1_96,                  HMAC_SHA1_96,
320                  HMAC_MD5_96,                  HMAC_MD5_96,
321          };          };
# Line 2343  static void init_about_dlg(PTInstVar pva Line 2339  static void init_about_dlg(PTInstVar pva
2339          get_file_version("ttxssh.dll", &a, &b, &c, &d);          get_file_version("ttxssh.dll", &a, &b, &c, &d);
2340          _snprintf_s(buf, sizeof(buf), _TRUNCATE,          _snprintf_s(buf, sizeof(buf), _TRUNCATE,
2341  #ifdef WITH_CAMELLIA_DRAFT  #ifdef WITH_CAMELLIA_DRAFT
 #ifdef WITH_HMAC_SHA2_DRAFT  
 //              "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia/HMAC-SHA2", a, b);  
                 "TTSSH\r\nTera Term Secure Shell extension, %d.%d (Camellia/HMAC-SHA2)", a, b);  
 #else  
2342                  "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);
 #endif  
 #else  
 #ifdef WITH_HMAC_SHA2_DRAFT  
                 "TTSSH\r\nTera Term Secure Shell extension, %d.%d with HMAC-SHA2 support", a, b);  
2343  #else  #else
2344                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);                  "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
2345  #endif  #endif
 #endif  
2346          SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);          SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
2347    
2348          // OpenSSLのバージョンを設定する (2005.1.24 yutaka)          // OpenSSLのバージョンを設定する (2005.1.24 yutaka)

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

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