[Ttssh2-commit] [4600] HMAC-SHA2 を正式サポート

svnno****@sourc***** svnno****@sourc*****
2011年 8月 28日 (日) 23:02:55 JST


Revision: 4600
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4600
Author:   maya
Date:     2011-08-28 23:02:55 +0900 (Sun, 28 Aug 2011)

Log Message:
-----------
HMAC-SHA2 を正式サポート

Modified Paths:
--------------
    trunk/doc/en/html/about/copyright.html
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/copyright.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/config.h
    trunk/ttssh2/ttxssh/ssh.h
    trunk/ttssh2/ttxssh/ttxssh.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/copyright.html
===================================================================
--- trunk/doc/en/html/about/copyright.html	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/doc/en/html/about/copyright.html	2011-08-28 14:02:55 UTC (rev 4600)
@@ -186,7 +186,7 @@
 Key exchange method: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521
 Public key algorithm of server host key: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521
 Encryption algorithm: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit)
-MAC algorithm: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-****@opens*****
+MAC algorithm: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-****@opens*****, hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96
 Public key algorithm of public key authentication: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521
 </pre>
 

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/doc/en/html/about/history.html	2011-08-28 14:02:55 UTC (rev 4600)
@@ -1719,6 +1719,7 @@
 <ul class="history">
   <li>Changes
     <ul>
+      <li>added support for SSH2 MAC algorithms: hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96</li>
       <li>added the PuTTY version on the version dialog.</li>
       <li>removed the random initialization because it takes a long time to connect.</li>
       <li>The timestamp of the log file is recorded on the millisecond time scale.</li>

Modified: trunk/doc/ja/html/about/copyright.html
===================================================================
--- trunk/doc/ja/html/about/copyright.html	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/doc/ja/html/about/copyright.html	2011-08-28 14:02:55 UTC (rev 4600)
@@ -173,7 +173,7 @@
 Œ®ŒðŠ·•ûŽ®: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521
 ƒT[ƒoƒzƒXƒgŒ®‚ÌŒöŠJŒ®ƒAƒ‹ƒSƒŠƒYƒ€: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521
 ˆÃ†‰»ƒAƒ‹ƒSƒŠƒYƒ€: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit)
-MACƒAƒ‹ƒSƒŠƒYƒ€: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-****@opens*****
+MACƒAƒ‹ƒSƒŠƒYƒ€: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-****@opens*****, hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96
 ŒöŠJŒ®”FØ‚ÌŒöŠJŒ®ƒAƒ‹ƒSƒŠƒYƒ€: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521
 </pre>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/doc/ja/html/about/history.html	2011-08-28 14:02:55 UTC (rev 4600)
@@ -1720,6 +1720,7 @@
 <ul class="history">
   <li>•ÏX
     <ul>
+      <li>SSH2 ‚Ì MAC ƒAƒ‹ƒSƒŠƒYƒ€‚Æ‚µ‚Ä hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 ‚ðƒTƒ|[ƒg‚µ‚½B</li>
       <li>ƒo[ƒWƒ‡ƒ“ƒ_ƒCƒAƒƒO‚ɁAPuTTY‚̃o[ƒWƒ‡ƒ“‚ð•\‹L‚·‚é‚悤‚É‚µ‚½B</li>
       <li>Ú‘±Žž‚ÉŽžŠÔ‚ª‚©‚©‚邽‚߁AÈ—ª‚Å‚«‚闐”‚̏‰Šú‰»‚ðíœ‚µ‚½B</li>
       <li>ƒƒOƒtƒ@ƒCƒ‹‚̃^ƒCƒ€ƒXƒ^ƒ“ƒv‚ðƒ~ƒŠ•b‚Ü‚Å‹L˜^‚·‚é‚悤‚É‚µ‚½B</li>

Modified: trunk/ttssh2/ttxssh/config.h
===================================================================
--- trunk/ttssh2/ttxssh/config.h	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/ttssh2/ttxssh/config.h	2011-08-28 14:02:55 UTC (rev 4600)
@@ -2,10 +2,6 @@
 // ƒRƒ“ƒpƒCƒ‹‚É‚¨‚¢‚Ä on/off ‚·‚邽‚ß‚É—˜—p‚·‚é‚ƁATERATERM.INI‚É
 // •Û‘¶‚·‚é‚Æ‚«‚Ì‹L†‚ª‚¸‚ê‚Ä‚µ‚Ü‚¤‚Ì‚Å‚â‚Á‚Ä‚Í‚¢‚¯‚È‚¢B
 
-// HMAC-SHA2 draft
-// http://tools.ietf.org/html/draft-dbider-sha2-mac-for-ssh-02
-#undef WITH_HMAC_SHA2_DRAFT
-
 // Camellia support draft
 // http://tools.ietf.org/html/draft-kanno-secsh-camellia-02
 // https://bugzilla.mindrot.org/show_bug.cgi?id=1340

Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/ttssh2/ttxssh/ssh.h	2011-08-28 14:02:55 UTC (rev 4600)
@@ -358,12 +358,10 @@
 	HMAC_SHA1_96,
 	HMAC_MD5_96,
 	HMAC_RIPEMD160,
-#ifdef WITH_HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 	HMAC_SHA2_256,
 	HMAC_SHA2_256_96,
 	HMAC_SHA2_512,
 	HMAC_SHA2_512_96,
-#endif	// HMAC-SHA2 support
 	HMAC_UNKNOWN,
 	HMAC_MAX = HMAC_UNKNOWN,
 } hmac_type;
@@ -381,12 +379,10 @@
 	{HMAC_SHA1_96,     "hmac-sha1-96",               EVP_sha1,      96}, // RFC4253
 	{HMAC_MD5_96,      "hmac-md5-96",                EVP_md5,       96}, // RFC4253
 	{HMAC_RIPEMD160,   "hmac-****@opens*****", EVP_ripemd160, 0},
-#ifdef WITH_HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 	{HMAC_SHA2_256,    "hmac-sha2-256",              EVP_sha256,    0},  // 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
 	{HMAC_SHA2_512,    "hmac-sha2-512",              EVP_sha512,    0},  // 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
 	{HMAC_NONE,        NULL,                         NULL,          0},
 };
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2011-08-26 03:27:34 UTC (rev 4599)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2011-08-28 14:02:55 UTC (rev 4600)
@@ -308,18 +308,14 @@
 static void normalize_mac_order(char FAR * buf)
 {
 	static char default_strings[] = {
-#ifdef WITH_HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 		HMAC_SHA2_512,
 		HMAC_SHA2_256,
-#endif	// HMAC-SHA2 support
 		HMAC_SHA1,
 		HMAC_RIPEMD160,
 		HMAC_MD5,
 		HMAC_NONE,
-#ifdef WITH_HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 		HMAC_SHA2_512_96,
 		HMAC_SHA2_256_96,
-#endif	// HMAC-SHA2 support
 		HMAC_SHA1_96,
 		HMAC_MD5_96,
 	};
@@ -2343,19 +2339,10 @@
 	get_file_version("ttxssh.dll", &a, &b, &c, &d);
 	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
 #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
 		"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);
-#else
 		"TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
 #endif
-#endif
 	SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
 
 	// OpenSSL‚̃o[ƒWƒ‡ƒ“‚ðÝ’è‚·‚é (2005.1.24 yutaka)



Ttssh2-commit メーリングリストの案内