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

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c




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



 Parent Directory

|  Revision Log



|  Patch














revision 4600 by maya,
Sun Aug 28 14:02:55 2011 UTC




revision 4601 by maya,
Sun Aug 28 14:23:32 2011 UTC






#

Line 234 
 static void normalize_cipher_order(char


Line 234 
 static void normalize_cipher_order(char












234
 #else
 #else

















235
         // for SSH2(yutaka)
         // for SSH2(yutaka)

















236
         static char default_strings[] = {
         static char default_strings[] = {














 #ifdef WITH_CAMELLIA_DRAFT
 













237
                 SSH2_CIPHER_CAMELLIA256_CTR,
                 SSH2_CIPHER_CAMELLIA256_CTR,

















238
                 SSH2_CIPHER_AES256_CTR,
                 SSH2_CIPHER_AES256_CTR,

















239
                 SSH2_CIPHER_CAMELLIA256_CBC,
                 SSH2_CIPHER_CAMELLIA256_CBC,











#

Line 247 
 static void normalize_cipher_order(char


Line 246 
 static void normalize_cipher_order(char












246
                 SSH2_CIPHER_AES128_CTR,
                 SSH2_CIPHER_AES128_CTR,

















247
                 SSH2_CIPHER_CAMELLIA128_CBC,
                 SSH2_CIPHER_CAMELLIA128_CBC,

















248
                 SSH2_CIPHER_AES128_CBC,
                 SSH2_CIPHER_AES128_CBC,














 #else // WITH_CAMELLIA_DRAFT
 










                 SSH2_CIPHER_AES256_CTR,
 










                 SSH2_CIPHER_AES256_CBC,
 










                 SSH2_CIPHER_AES192_CTR,
 










                 SSH2_CIPHER_AES192_CBC,
 










                 SSH2_CIPHER_AES128_CTR,
 










                 SSH2_CIPHER_AES128_CBC,
 










 #endif // WITH_CAMELLIA_DRAFT
 













249
                 SSH2_CIPHER_3DES_CTR,
                 SSH2_CIPHER_3DES_CTR,

















250
                 SSH2_CIPHER_3DES_CBC,
                 SSH2_CIPHER_3DES_CBC,

















251
                 SSH2_CIPHER_BLOWFISH_CTR,
                 SSH2_CIPHER_BLOWFISH_CTR,











#

Line 2338 
 static void init_about_dlg(PTInstVar pva


Line 2329 
 static void init_about_dlg(PTInstVar pva












2329
         // TTSSHのバージョンを設定する (2005.2.28 yutaka)
         // TTSSHのバージョンを設定する (2005.2.28 yutaka)

















2330
         get_file_version("ttxssh.dll", &a, &b, &c, &d);
         get_file_version("ttxssh.dll", &a, &b, &c, &d);

















2331
         _snprintf_s(buf, sizeof(buf), _TRUNCATE,
         _snprintf_s(buf, sizeof(buf), _TRUNCATE,















2332


 #ifdef WITH_CAMELLIA_DRAFT


                     "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
















                 "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia support", a, b);


 
















 #else


 
















                 "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);


 
















 #endif


 















2333
         SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
         SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);

















2334
 
 

















2335
         // OpenSSLのバージョンを設定する (2005.1.24 yutaka)
         // OpenSSLのバージョンを設定する (2005.1.24 yutaka)











#

Line 2557 
 static char FAR *get_cipher_name(int cip


Line 2544 
 static char FAR *get_cipher_name(int cip












2544
                 return "Blowfish-CTR(SSH2)";
                 return "Blowfish-CTR(SSH2)";

















2545
         case SSH2_CIPHER_CAST128_CTR:
         case SSH2_CIPHER_CAST128_CTR:

















2546
                 return "CAST128-CTR(SSH2)";
                 return "CAST128-CTR(SSH2)";














 #ifdef WITH_CAMELLIA_DRAFT
 













2547
         case SSH2_CIPHER_CAMELLIA128_CBC:
         case SSH2_CIPHER_CAMELLIA128_CBC:

















2548
                 return "Camellia128-CBC(SSH2)";
                 return "Camellia128-CBC(SSH2)";

















2549
         case SSH2_CIPHER_CAMELLIA192_CBC:
         case SSH2_CIPHER_CAMELLIA192_CBC:











#

Line 2570 
 static char FAR *get_cipher_name(int cip


Line 2556 
 static char FAR *get_cipher_name(int cip












2556
                 return "Camellia192-CTR(SSH2)";
                 return "Camellia192-CTR(SSH2)";

















2557
         case SSH2_CIPHER_CAMELLIA256_CTR:
         case SSH2_CIPHER_CAMELLIA256_CTR:

















2558
                 return "Camellia256-CTR(SSH2)";
                 return "Camellia256-CTR(SSH2)";














 #endif // WITH_CAMELLIA_DRAFT
 













2559
 
 

















2560
         default:
         default:

















2561
                 return NULL;
                 return NULL;





























Legend:



Removed from v.4600
 


changed lines


 
Added in v.4601













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c
-revision 4600 by maya,
Sun Aug 28 14:02:55 2011 UTC
+revision 4601 by maya,
Sun Aug 28 14:23:32 2011 UTC
 Line 234 
 static void normalize_cipher_order(char
  #else
          // for SSH2(yutaka)
          static char default_strings[] = {
- #ifdef WITH_CAMELLIA_DRAFT
                  SSH2_CIPHER_CAMELLIA256_CTR,
                  SSH2_CIPHER_AES256_CTR,
                  SSH2_CIPHER_CAMELLIA256_CBC,
-Line 247 
 static void normalize_cipher_order(char
+Line 246 
 static void normalize_cipher_order(char
                  SSH2_CIPHER_AES128_CTR,
                  SSH2_CIPHER_CAMELLIA128_CBC,
                  SSH2_CIPHER_AES128_CBC,
- #else // WITH_CAMELLIA_DRAFT
-                 SSH2_CIPHER_AES256_CTR,
-                 SSH2_CIPHER_AES256_CBC,
-                 SSH2_CIPHER_AES192_CTR,
-                 SSH2_CIPHER_AES192_CBC,
-                 SSH2_CIPHER_AES128_CTR,
-                 SSH2_CIPHER_AES128_CBC,
- #endif // WITH_CAMELLIA_DRAFT
                  SSH2_CIPHER_3DES_CTR,
                  SSH2_CIPHER_3DES_CBC,
                  SSH2_CIPHER_BLOWFISH_CTR,
-Line 2338 
 static void init_about_dlg(PTInstVar pva
+Line 2329 
 static void init_about_dlg(PTInstVar pva
          // TTSSHのバージョンを設定する (2005.2.28 yutaka)
          get_file_version("ttxssh.dll", &a, &b, &c, &d);
          _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- #ifdef WITH_CAMELLIA_DRAFT
+                     "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
-                 "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia support", a, b);
- #else
-                 "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
- #endif
          SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
          // OpenSSLのバージョンを設定する (2005.1.24 yutaka)
-Line 2557 
 static char FAR *get_cipher_name(int cip
+Line 2544 
 static char FAR *get_cipher_name(int cip
                  return "Blowfish-CTR(SSH2)";
          case SSH2_CIPHER_CAST128_CTR:
                  return "CAST128-CTR(SSH2)";
- #ifdef WITH_CAMELLIA_DRAFT
          case SSH2_CIPHER_CAMELLIA128_CBC:
                  return "Camellia128-CBC(SSH2)";
          case SSH2_CIPHER_CAMELLIA192_CBC:
-Line 2570 
 static char FAR *get_cipher_name(int cip
+Line 2556 
 static char FAR *get_cipher_name(int cip
                  return "Camellia192-CTR(SSH2)";
          case SSH2_CIPHER_CAMELLIA256_CTR:
                  return "Camellia256-CTR(SSH2)";
- #endif // WITH_CAMELLIA_DRAFT
          default:
                  return NULL;
 Legend:



Removed from v.4600
 


changed lines


 
Added in v.4601
 Legend:



Removed from v.4600
 


changed lines


 
Added in v.4601
-Removed from v.4600
+Added in v.4601
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository