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 4432 by maya,
Sun Apr 10 14:28:55 2011 UTC




revision 4433 by doda,
Mon Apr 11 00:29:12 2011 UTC






#

Line 232 
 static void normalize_cipher_order(char


Line 232 
 static void normalize_cipher_order(char












232
 #else
 #else

















233
         // for SSH2(yutaka)
         // for SSH2(yutaka)

















234
         static char default_strings[] = {
         static char default_strings[] = {












235
 
 #ifdef WITH_CAMELLIA_DRAFT







236
 
                 SSH2_CIPHER_CAMELLIA256_CTR,












237
                 SSH2_CIPHER_AES256_CTR,
                 SSH2_CIPHER_AES256_CTR,












238
 
                 SSH2_CIPHER_CAMELLIA256_CBC,












239
                 SSH2_CIPHER_AES256_CBC,
                 SSH2_CIPHER_AES256_CBC,












240
 
                 SSH2_CIPHER_CAMELLIA192_CTR,












241
                 SSH2_CIPHER_AES192_CTR,
                 SSH2_CIPHER_AES192_CTR,












242
 
                 SSH2_CIPHER_CAMELLIA192_CBC,












243
                 SSH2_CIPHER_AES192_CBC,
                 SSH2_CIPHER_AES192_CBC,












244
 
                 SSH2_CIPHER_CAMELLIA128_CTR,












245
                 SSH2_CIPHER_AES128_CTR,
                 SSH2_CIPHER_AES128_CTR,












246
 
                 SSH2_CIPHER_CAMELLIA128_CBC,












247
                 SSH2_CIPHER_AES128_CBC,
                 SSH2_CIPHER_AES128_CBC,












248
 
 #else // WITH_CAMELLIA_DRAFT







249
 
                 SSH2_CIPHER_AES256_CTR,







250
 
                 SSH2_CIPHER_AES256_CBC,







251
 
                 SSH2_CIPHER_AES192_CTR,







252
 
                 SSH2_CIPHER_AES192_CBC,







253
 
                 SSH2_CIPHER_AES128_CTR,







254
 
                 SSH2_CIPHER_AES128_CBC,







255
 
 #endif // WITH_CAMELLIA_DRAFT












256
                 SSH2_CIPHER_3DES_CTR,
                 SSH2_CIPHER_3DES_CTR,

















257
                 SSH2_CIPHER_3DES_CBC,
                 SSH2_CIPHER_3DES_CBC,

















258
                 SSH2_CIPHER_BLOWFISH_CTR,
                 SSH2_CIPHER_BLOWFISH_CTR,











#

Line 2280 
 static void init_about_dlg(PTInstVar pva


Line 2295 
 static void init_about_dlg(PTInstVar pva












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

















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

















2297
         _snprintf_s(buf, sizeof(buf), _TRUNCATE,
         _snprintf_s(buf, sizeof(buf), _TRUNCATE,












2298
 
 #ifdef WITH_CAMELLIA_DRAFT







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







2300
 
 #else












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












2302
 
 #endif












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

















2304
 
 

















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











#

Line 2487 
 static char FAR *get_cipher_name(int cip


Line 2506 
 static char FAR *get_cipher_name(int cip












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

















2507
         case SSH2_CIPHER_CAST128_CTR:
         case SSH2_CIPHER_CAST128_CTR:

















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












2509
 
 #ifdef WITH_CAMELLIA_DRAFT







2510
 
         case SSH2_CIPHER_CAMELLIA128_CBC:







2511
 
                 return "Camellia128-CBC(SSH2)";







2512
 
         case SSH2_CIPHER_CAMELLIA192_CBC:







2513
 
                 return "Camellia192-CBC(SSH2)";







2514
 
         case SSH2_CIPHER_CAMELLIA256_CBC:







2515
 
                 return "Camellia256-CBC(SSH2)";







2516
 
         case SSH2_CIPHER_CAMELLIA128_CTR:







2517
 
                 return "Camellia128-CTR(SSH2)";







2518
 
         case SSH2_CIPHER_CAMELLIA192_CTR:







2519
 
                 return "Camellia192-CTR(SSH2)";







2520
 
         case SSH2_CIPHER_CAMELLIA256_CTR:







2521
 
                 return "Camellia256-CTR(SSH2)";







2522
 
 #endif // WITH_CAMELLIA_DRAFT












2523
 
 

















2524
         default:
         default:

















2525
                 return NULL;
                 return NULL;





























Legend:



Removed from v.4432
 


changed lines


 
Added in v.4433













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ttxssh.c
-revision 4432 by maya,
Sun Apr 10 14:28:55 2011 UTC
+revision 4433 by doda,
Mon Apr 11 00:29:12 2011 UTC
 Line 232 
 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,
                  SSH2_CIPHER_AES256_CBC,
+                 SSH2_CIPHER_CAMELLIA192_CTR,
                  SSH2_CIPHER_AES192_CTR,
+                 SSH2_CIPHER_CAMELLIA192_CBC,
                  SSH2_CIPHER_AES192_CBC,
+                 SSH2_CIPHER_CAMELLIA128_CTR,
                  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 2280 
 static void init_about_dlg(PTInstVar pva
+Line 2295 
 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 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 2487 
 static char FAR *get_cipher_name(int cip
+Line 2506 
 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:
+                 return "Camellia192-CBC(SSH2)";
+         case SSH2_CIPHER_CAMELLIA256_CBC:
+                 return "Camellia256-CBC(SSH2)";
+         case SSH2_CIPHER_CAMELLIA128_CTR:
+                 return "Camellia128-CTR(SSH2)";
+         case SSH2_CIPHER_CAMELLIA192_CTR:
+                 return "Camellia192-CTR(SSH2)";
+         case SSH2_CIPHER_CAMELLIA256_CTR:
+                 return "Camellia256-CTR(SSH2)";
+ #endif // WITH_CAMELLIA_DRAFT
          default:
                  return NULL;
 Legend:



Removed from v.4432
 


changed lines


 
Added in v.4433
 Legend:



Removed from v.4432
 


changed lines


 
Added in v.4433
-Removed from v.4432
+Added in v.4433
-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