svnno****@sourc*****
svnno****@sourc*****
2011年 4月 8日 (金) 16:13:27 JST
Tera TermRevision: 4422
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4422
Author: doda
Date: 2011-04-08 16:13:27 +0900 (Fri, 08 Apr 2011)
Log Message:
-----------
hmac-sha1-96, hmac-md5-96 をサãƒãƒ¼ãƒˆã€‚
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.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 03:53:59 UTC (rev 4421)
+++ trunk/doc/en/html/about/history.html 2011-04-08 07:13:27 UTC (rev 4422)
@@ -1677,13 +1677,14 @@
<li>Changes
<ul>
<li>When the ECDSA key is selected on the SSH key generator dialog, the input box of the key bits is disabled.</li>
- <li>Some kind of the KEX, host key, HMAC and compression algorithm order can be specified in the teraterm.ini file.
+ <li>Some kind of the KEX, host key, MAC and compression algorithm order can be specified in the teraterm.ini file.
<ul>
<li>KexOrder=56743210</li>
<li>HostKeyOrder=456230</li>
<li>MacOrder=120</li>
<li>CompOrder=3210</li>
</ul></li>
+ <li>added support for SSH2 MAC algorithms: hmac-sha1-96, hmac-md5-96</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-04-08 03:53:59 UTC (rev 4421)
+++ trunk/doc/ja/html/about/history.html 2011-04-08 07:13:27 UTC (rev 4422)
@@ -1678,13 +1678,14 @@
<li>•ÏX
<ul>
<li>SSHŒ®¶¬ƒ_ƒCƒAƒƒO‚ÅAŒ®‚ÌŽí—Þ‚ÉECDSAŒ®‚ð‘I‚ñ‚¾ê‡‚ÍŒ®‚̃rƒbƒg”‚Ì“ü—̓{ƒbƒNƒX‚𖳌ø‰»‚·‚é‚悤‚É‚µ‚½B</li>
- <li>KEXAƒzƒXƒgƒL[AHMACAˆ³kƒAƒ‹ƒSƒŠƒYƒ€ƒI[ƒ_[‚ðAteraterm.ini‚̃Gƒ“ƒgƒŠ‚ÅŽw’è‚Å‚«‚é‚悤‚É‚µ‚½B
+ <li>KEXAƒzƒXƒgƒL[AMACAˆ³kƒAƒ‹ƒSƒŠƒYƒ€ƒI[ƒ_[‚ðAteraterm.ini‚̃Gƒ“ƒgƒŠ‚ÅŽw’è‚Å‚«‚é‚悤‚É‚µ‚½B
<ul>
<li>KexOrder=56743210</li>
<li>HostKeyOrder=456230</li>
<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>
</ul>
</li>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2011-04-08 03:53:59 UTC (rev 4421)
+++ trunk/installer/release/TERATERM.INI 2011-04-08 07:13:27 UTC (rev 4422)
@@ -647,8 +647,10 @@
; MAC algorithm order(SSH2)
; 1...HMAC-SHA1
; 2...HMAC-MD5
+; 3...HMAC-SHA1-96
+; 4...HMAC-MD5-96
; 0...below this line are disabled.
-MacOrder=120
+MacOrder=12340
; Compression algorithm order(SSH2)
; 1...none
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2011-04-08 03:53:59 UTC (rev 4421)
+++ trunk/ttssh2/ttxssh/ssh.h 2011-04-08 07:13:27 UTC (rev 4422)
@@ -333,6 +333,8 @@
HMAC_NONE, /* disabled line */
HMAC_SHA1,
HMAC_MD5,
+ HMAC_SHA1_96,
+ HMAC_MD5_96,
HMAC_UNKNOWN,
HMAC_MAX = HMAC_UNKNOWN,
} hmac_type;
@@ -345,9 +347,11 @@
} ssh2_mac_t;
static ssh2_mac_t ssh2_macs[] = {
- {HMAC_SHA1, "hmac-sha1", EVP_sha1, 0},
- {HMAC_MD5, "hmac-md5", EVP_md5, 0},
- {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_NONE, NULL, NULL, 0},
};
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2011-04-08 03:53:59 UTC (rev 4421)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2011-04-08 07:13:27 UTC (rev 4422)
@@ -293,6 +293,8 @@
static char default_strings[] = {
HMAC_SHA1,
HMAC_MD5,
+ HMAC_SHA1_96,
+ HMAC_MD5_96,
HMAC_NONE,
};