[Ttssh2-commit] [4423] hmac-ripemd160 @ openssh. com をサポート。hmac-ripemd160 は IANA に登録されていないのでサポートしない。

svnno****@sourc***** svnno****@sourc*****
2011年 4月 8日 (金) 16:34:37 JST


Revision: 4423
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4423
Author:   doda
Date:     2011-04-08 16:34:37 +0900 (Fri, 08 Apr 2011)

Log Message:
-----------
hmac-****@opens***** をサポート。hmac-ripemd160 は IANA に登録されていないのでサポートしない。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/installer/release/TERATERM.INI
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ssh.h
    trunk/ttssh2/ttxssh/ttxssh.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2011-04-08 07:13:27 UTC (rev 4422)
+++ trunk/doc/en/html/about/history.html	2011-04-08 07:34:37 UTC (rev 4423)
@@ -1684,7 +1684,7 @@
           <li>MacOrder=120</li>
           <li>CompOrder=3210</li>
         </ul></li>
-      <li>added support for SSH2 MAC algorithms: hmac-sha1-96, hmac-md5-96</li>
+      <li>added support for SSH2 MAC algorithms: hmac-sha1-96, hmac-md5-96, hmac-****@opens*****</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2011-04-08 07:13:27 UTC (rev 4422)
+++ trunk/doc/ja/html/about/history.html	2011-04-08 07:34:37 UTC (rev 4423)
@@ -1685,7 +1685,7 @@
           <li>MacOrder=120</li>
           <li>CompOrder=3210</li>
         </ul></li>
-      <li>SSH2 ‚Ì MAC ƒAƒ‹ƒSƒŠƒYƒ€‚Æ‚µ‚Ä hmac-sha1-96, hmac-md5-96 ‚ðƒTƒ|[ƒg‚µ‚½B</li>
+      <li>SSH2 ‚Ì MAC ƒAƒ‹ƒSƒŠƒYƒ€‚Æ‚µ‚Ä hmac-sha1-96, hmac-md5-96, hmac-****@opens***** ‚ðƒTƒ|[ƒg‚µ‚½B</li>
     </ul>
   </li>
 

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2011-04-08 07:13:27 UTC (rev 4422)
+++ trunk/installer/release/TERATERM.INI	2011-04-08 07:34:37 UTC (rev 4423)
@@ -645,12 +645,13 @@
 HostKeyOrder=456230
 
 ; MAC algorithm order(SSH2)
-;  1...HMAC-SHA1
-;  2...HMAC-MD5
-;  3...HMAC-SHA1-96
-;  4...HMAC-MD5-96
+;  1...hmac-sha1
+;  2...hmac-md5
+;  3...hmac-sha1-96
+;  4...hmac-md5-96
+;  5...h****@opens*****
 ;  0...below this line are disabled.
-MacOrder=12340
+MacOrder=152340
 
 ; Compression algorithm order(SSH2)
 ;  1...none

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2011-04-08 07:13:27 UTC (rev 4422)
+++ trunk/ttssh2/ttxssh/ssh.c	2011-04-08 07:34:37 UTC (rev 4423)
@@ -4477,7 +4477,7 @@
 static hmac_type choose_SSH2_hmac_algorithm(char *server_proposal, char *my_proposal)
 {
 	hmac_type type = HMAC_UNKNOWN;
-	char str_hmac[16];
+	char str_hmac[64];
 	ssh2_mac_t *ptr = ssh2_macs;
 
 	choose_SSH2_proposal(server_proposal, my_proposal, str_hmac, sizeof(str_hmac));

Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2011-04-08 07:13:27 UTC (rev 4422)
+++ trunk/ttssh2/ttxssh/ssh.h	2011-04-08 07:34:37 UTC (rev 4423)
@@ -335,6 +335,7 @@
 	HMAC_MD5,
 	HMAC_SHA1_96,
 	HMAC_MD5_96,
+	HMAC_RIPEMD160,
 	HMAC_UNKNOWN,
 	HMAC_MAX = HMAC_UNKNOWN,
 } hmac_type;
@@ -347,11 +348,12 @@
 } ssh2_mac_t;
 
 static ssh2_mac_t ssh2_macs[] = {
-	{HMAC_SHA1,    "hmac-sha1",    EVP_sha1, 0},
-	{HMAC_MD5,     "hmac-md5",     EVP_md5,  0},
-	{HMAC_SHA1_96, "hmac-sha1-96", EVP_sha1, 96},
-	{HMAC_MD5_96,  "hmac-md5-96",  EVP_md5,  96},
-	{HMAC_NONE,    NULL,           NULL,     0},
+	{HMAC_SHA1,      "hmac-sha1",                  EVP_sha1,      0},
+	{HMAC_MD5,       "hmac-md5",                   EVP_md5,       0},
+	{HMAC_SHA1_96,   "hmac-sha1-96",               EVP_sha1,      96},
+	{HMAC_MD5_96,    "hmac-md5-96",                EVP_md5,       96},
+	{HMAC_RIPEMD160, "hmac-****@opens*****", EVP_ripemd160, 0},
+	{HMAC_NONE,      NULL,                         NULL,          0},
 };
 
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2011-04-08 07:13:27 UTC (rev 4422)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2011-04-08 07:34:37 UTC (rev 4423)
@@ -292,6 +292,7 @@
 {
 	static char default_strings[] = {
 		HMAC_SHA1,
+		HMAC_RIPEMD160,
 		HMAC_MD5,
 		HMAC_SHA1_96,
 		HMAC_MD5_96,



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