[Ttssh2-commit] [4427] HMAC-SHA2 のフタのしかたを undef に変更

svnno****@sourc***** svnno****@sourc*****
2011年 4月 9日 (土) 10:43:31 JST


Revision: 4427
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4427
Author:   maya
Date:     2011-04-09 10:43:31 +0900 (Sat, 09 Apr 2011)

Log Message:
-----------
HMAC-SHA2 のフタのしかたを undef に変更

# このやり方なら、コード部分だけなら camellia もコミットしておける?

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	2011-04-08 08:52:32 UTC (rev 4426)
+++ trunk/ttssh2/ttxssh/ssh.h	2011-04-09 01:43:31 UTC (rev 4427)
@@ -54,7 +54,11 @@
 // yutaka
 #define SSH2_USE
 
+// HMAC-SHA2 draft
+// http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-00.txt
+#undef HMAC_SHA2_DRAFT
 
+
 /* Some of this code has been adapted from Ian Goldberg's Pilot SSH */
 
 typedef enum {
@@ -336,7 +340,7 @@
 	HMAC_SHA1_96,
 	HMAC_MD5_96,
 	HMAC_RIPEMD160,
-#if 0	// HMAC-SHA2 support
+#ifdef HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 	HMAC_SHA2_256,
 	HMAC_SHA2_256_96,
 	HMAC_SHA2_512,
@@ -359,7 +363,7 @@
 	{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},
-#if 0	// HMAC-SHA2 support
+#if HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 	{HMAC_SHA2_256,    "hmac-sha2-256",              EVP_sha256,    0},
 	{HMAC_SHA2_256_96, "hmac-sha2-256-96",           EVP_sha256,    96},
 	{HMAC_SHA2_512,    "hmac-sha2-512",              EVP_sha512,    0},

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2011-04-08 08:52:32 UTC (rev 4426)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2011-04-09 01:43:31 UTC (rev 4427)
@@ -297,7 +297,7 @@
 		HMAC_NONE,
 		HMAC_SHA1_96,
 		HMAC_MD5_96,
-#if 0	// HMAC-SHA2 support
+#ifdef HMAC_SHA2_DRAFT	// HMAC-SHA2 support
 		HMAC_SHA2_256,
 		HMAC_SHA2_256_96,
 		HMAC_SHA2_512,



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