svnno****@sourc*****
svnno****@sourc*****
2012年 9月 6日 (木) 12:58:36 JST
Tera TermRevision: 5016
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5016
Author: doda
Date: 2012-09-06 12:58:36 +0900 (Thu, 06 Sep 2012)
Log Message:
-----------
以下の理由から hmac-sha2-256-96, hmac-sha2-512-96 のサポートを廃止。
・hmac-sha2-256/hmac-sha2-512 と比べてメリットがない
・RFC6668 に入らなかった
・OpenSSH 6.1 でサポートが廃止された
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ssh.h
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2012-08-31 09:22:57 UTC (rev 5015)
+++ trunk/ttssh2/ttxssh/ssh.h 2012-09-06 03:58:36 UTC (rev 5016)
@@ -374,9 +374,9 @@
{HMAC_MD5_96, "hmac-md5-96", EVP_md5, 96}, // RFC4253
{HMAC_RIPEMD160, "hmac-****@opens*****", EVP_ripemd160, 0},
{HMAC_SHA2_256, "hmac-sha2-256", EVP_sha256, 0}, // RFC6668
- {HMAC_SHA2_256_96, "hmac-sha2-256-96", EVP_sha256, 96}, // draft-dbider-sha2-mac-for-ssh-05, deleted at 06
+// {HMAC_SHA2_256_96, "hmac-sha2-256-96", EVP_sha256, 96}, // draft-dbider-sha2-mac-for-ssh-05, deleted at 06
{HMAC_SHA2_512, "hmac-sha2-512", EVP_sha512, 0}, // RFC6668
- {HMAC_SHA2_512_96, "hmac-sha2-512-96", EVP_sha512, 96}, // draft-dbider-sha2-mac-for-ssh-05, deleted at 06
+// {HMAC_SHA2_512_96, "hmac-sha2-512-96", EVP_sha512, 96}, // draft-dbider-sha2-mac-for-ssh-05, deleted at 06
{HMAC_NONE, NULL, NULL, 0},
};
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2012-08-31 09:22:57 UTC (rev 5015)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2012-09-06 03:58:36 UTC (rev 5016)
@@ -305,10 +305,10 @@
HMAC_RIPEMD160,
HMAC_MD5,
HMAC_NONE,
- HMAC_SHA2_512_96,
- HMAC_SHA2_256_96,
HMAC_SHA1_96,
HMAC_MD5_96,
+ 0, // Dummy for HMAC_SHA2_512_96,
+ 0, // Dummy for HMAC_SHA2_256_96,
};
normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));