svnno****@sourc*****
svnno****@sourc*****
2011年 4月 11日 (月) 12:25:46 JST
Tera TermRevision: 4438
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4438
Author: maya
Date: 2011-04-11 12:25:46 +0900 (Mon, 11 Apr 2011)
Log Message:
-----------
マクロ名を変更。HMAC_SHA2_DRAFT -> WITH_HMAC_SHA2_DRAFT
Modified Paths:
--------------
trunk/ttssh2/ttxssh/config.h
trunk/ttssh2/ttxssh/ssh.h
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/config.h
===================================================================
--- trunk/ttssh2/ttxssh/config.h 2011-04-11 01:41:21 UTC (rev 4437)
+++ trunk/ttssh2/ttxssh/config.h 2011-04-11 03:25:46 UTC (rev 4438)
@@ -1,6 +1,6 @@
// HMAC-SHA2 draft
// http://tools.ietf.org/html/draft-dbider-sha2-mac-for-ssh-02
-#undef HMAC_SHA2_DRAFT
+#undef WITH_HMAC_SHA2_DRAFT
// Camellia support draft
// http://tools.ietf.org/html/draft-kanno-secsh-camellia-02
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2011-04-11 01:41:21 UTC (rev 4437)
+++ trunk/ttssh2/ttxssh/ssh.h 2011-04-11 03:25:46 UTC (rev 4438)
@@ -358,7 +358,7 @@
HMAC_SHA1_96,
HMAC_MD5_96,
HMAC_RIPEMD160,
-#ifdef HMAC_SHA2_DRAFT // HMAC-SHA2 support
+#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support
HMAC_SHA2_256,
HMAC_SHA2_256_96,
HMAC_SHA2_512,
@@ -381,7 +381,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},
-#ifdef HMAC_SHA2_DRAFT // HMAC-SHA2 support
+#ifdef WITH_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-11 01:41:21 UTC (rev 4437)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2011-04-11 03:25:46 UTC (rev 4438)
@@ -306,7 +306,7 @@
static void normalize_mac_order(char FAR * buf)
{
static char default_strings[] = {
-#ifdef HMAC_SHA2_DRAFT // HMAC-SHA2 support
+#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support
HMAC_SHA2_512,
HMAC_SHA2_256,
#endif // HMAC-SHA2 support
@@ -314,7 +314,7 @@
HMAC_RIPEMD160,
HMAC_MD5,
HMAC_NONE,
-#ifdef HMAC_SHA2_DRAFT // HMAC-SHA2 support
+#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support
HMAC_SHA2_512_96,
HMAC_SHA2_256_96,
#endif // HMAC-SHA2 support
@@ -2298,14 +2298,14 @@
get_file_version("ttxssh.dll", &a, &b, &c, &d);
_snprintf_s(buf, sizeof(buf), _TRUNCATE,
#ifdef WITH_CAMELLIA_DRAFT
-#ifdef HMAC_SHA2_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 HMAC_SHA2_DRAFT
+#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);