Commit: 5d812065251702570157283cdca29d4086bd15c5 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisión: 5d812065251702570157283cdca29d4086bd15c5 (tree)
• Tiempo: 2014-04-29 22:51:09
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of 64bit binaries.

Cambiar Resumen

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: protectprocess.c
• modified: socketwrapper.c

Diferencia incremental

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

--- a/protectprocess.c
+++ b/protectprocess.c
@@ -39,9 +39,9 @@
 #endif
 
 #ifdef USE_CODE_HOOK
-#if defined(_X86_)
+#if defined(_M_IX86)
 #define HOOK_JUMP_CODE_LENGTH 5
-#elif defined(_AMD64_)
+#elif defined(_M_AMD64)
 #define HOOK_JUMP_CODE_LENGTH 14
 #endif
 #endif
@@ -249,7 +249,7 @@ BOOL HookFunctionInCode(void* pOriginal, void* pNew, void* pBackupCode, BOOL bRe
 {
 	BOOL bResult;
 	bResult = FALSE;
-#if defined(_X86_)
+#if defined(_M_IX86)
 	{
 		BYTE JumpCode[HOOK_JUMP_CODE_LENGTH] = {0xe9, 0x00, 0x00, 0x00, 0x00};
 		size_t Relative;
@@ -277,7 +277,7 @@ BOOL HookFunctionInCode(void* pOriginal, void* pNew, void* pBackupCode, BOOL bRe
 			}
 		}
 	}
-#elif defined(_AMD64_)
+#elif defined(_M_AMD64)
 	{
 		BYTE JumpCode[HOOK_JUMP_CODE_LENGTH] = {0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 		size_t Absolute;

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -144,10 +144,17 @@ BOOL LoadOpenSSL()
 		return FALSE;
 #ifdef ENABLE_PROCESS_PROTECTION
 	// 同梱するOpenSSLのバージョンに合わせてSHA1ハッシュ値を変更すること
+#if defined(_M_IX86)
 	// ssleay32.dll 1.0.1g
 	RegisterTrustedModuleSHA1Hash("\xCB\xBA\x62\x61\x3C\x44\x1E\x94\xD2\xF4\xAD\xD5\x03\x43\x6F\x26\xD2\xAF\x2F\x21");
 	// libeay32.dll 1.0.1g
 	RegisterTrustedModuleSHA1Hash("\x4E\x53\x29\xC4\x32\x1B\x17\xA5\x4D\x40\xDF\x6F\xF6\xD2\x53\x7E\xBC\x54\x69\x1B");
+#elif defined(_M_AMD64)
+	// ssleay32.dll 1.0.1g
+	RegisterTrustedModuleSHA1Hash("\x10\x08\xFE\x10\x3A\xB2\xEC\x9E\x13\xAF\x29\xD7\xF4\xFC\x90\xE3\x9B\x8D\xAF\x12");
+	// libeay32.dll 1.0.1g
+	RegisterTrustedModuleSHA1Hash("\x30\x42\xCF\x84\x2B\x3F\x17\x3B\xF7\x97\xA5\x2B\x5F\x1A\x5A\xA2\x04\x02\x92\x92");
+#endif
 #endif
 	g_hOpenSSL = LoadLibrary("ssleay32.dll");
 	// バージョン固定のためlibssl32.dllの読み込みは脆弱性の原因になり得るので廃止