Commit: 5a1386b87710e85b4609536a735ce97106f39133 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 5a1386b87710e85b4609536a735ce97106f39133 (tree)
• Zeit: 2014-06-08 22:54:42
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of automatic software update.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: socketwrapper.c
• modified: socketwrapper.h
• modified: updater.c

Diff

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

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

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -539,6 +539,8 @@ BOOL DecryptSignature(const char* PublicKey, const void* pIn, DWORD InLength, vo
 	EVP_PKEY* pPKEY;
 	RSA* pRSA;
 	int i;
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
 	bResult = FALSE;
 	if(pBIO = p_BIO_new_mem_buf((void*)PublicKey, sizeof(char) * strlen(PublicKey)))
 	{
@@ -566,29 +568,44 @@ BOOL DecryptSignature(const char* PublicKey, const void* pIn, DWORD InLength, vo
 
 // ハッシュ計算
 // 他にも同等の関数はあるが主にマルウェア対策のための冗長化
-void GetHashSHA1(const void* pData, DWORD Size, void* pHash)
+BOOL GetHashSHA1(const void* pData, DWORD Size, void* pHash)
 {
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
 	p_SHA1((const unsigned char*)pData, (size_t)Size, (unsigned char*)pHash);
+	return TRUE;
 }
 
-void GetHashSHA224(const void* pData, DWORD Size, void* pHash)
+BOOL GetHashSHA224(const void* pData, DWORD Size, void* pHash)
 {
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
 	p_SHA224((const unsigned char*)pData, (size_t)Size, (unsigned char*)pHash);
+	return TRUE;
 }
 
-void GetHashSHA256(const void* pData, DWORD Size, void* pHash)
+BOOL GetHashSHA256(const void* pData, DWORD Size, void* pHash)
 {
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
 	p_SHA256((const unsigned char*)pData, (size_t)Size, (unsigned char*)pHash);
+	return TRUE;
 }
 
-void GetHashSHA384(const void* pData, DWORD Size, void* pHash)
+BOOL GetHashSHA384(const void* pData, DWORD Size, void* pHash)
 {
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
 	p_SHA384((const unsigned char*)pData, (size_t)Size, (unsigned char*)pHash);
+	return TRUE;
 }
 
-void GetHashSHA512(const void* pData, DWORD Size, void* pHash)
+BOOL GetHashSHA512(const void* pData, DWORD Size, void* pHash)
 {
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
 	p_SHA512((const unsigned char*)pData, (size_t)Size, (unsigned char*)pHash);
+	return TRUE;
 }
 
 // SSLセッションを開始

--- a/socketwrapper.h
+++ b/socketwrapper.h
@@ -21,11 +21,11 @@ void SetSSLConfirmCallback(LPSSLCONFIRMCALLBACK pCallback);
 BOOL SetSSLRootCertificate(const void* pData, DWORD Length);
 BOOL IsHostNameMatched(LPCSTR HostName, LPCSTR CommonName);
 BOOL DecryptSignature(const char* PublicKey, const void* pIn, DWORD InLength, void* pOut, DWORD OutLength, DWORD* pOutLength);
-void GetHashSHA1(const void* pData, DWORD Size, void* pHash);
-void GetHashSHA224(const void* pData, DWORD Size, void* pHash);
-void GetHashSHA256(const void* pData, DWORD Size, void* pHash);
-void GetHashSHA384(const void* pData, DWORD Size, void* pHash);
-void GetHashSHA512(const void* pData, DWORD Size, void* pHash);
+BOOL GetHashSHA1(const void* pData, DWORD Size, void* pHash);
+BOOL GetHashSHA224(const void* pData, DWORD Size, void* pHash);
+BOOL GetHashSHA256(const void* pData, DWORD Size, void* pHash);
+BOOL GetHashSHA384(const void* pData, DWORD Size, void* pHash);
+BOOL GetHashSHA512(const void* pData, DWORD Size, void* pHash);
 BOOL AttachSSL(SOCKET s, SOCKET parent, BOOL* pbAborted);
 BOOL DetachSSL(SOCKET s);
 BOOL IsSSLAttached(SOCKET s);

--- a/updater.c
+++ b/updater.c
@@ -180,20 +180,22 @@ BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir, DWORD* pVersion, LPTST
 				{
 					if(ReadFileViaHTTP(&Buf1, sizeof(Buf1), &Length, HTTP_USER_AGENT, UPDATE_SERVER, UPDATE_LIST_PATH))
 					{
-						GetHashSHA512(&Buf1, Length, &Hash);
-						if(memcmp(&Hash, &UpdateHash.ListHash, 64) == 0)
+						if(GetHashSHA512(&Buf1, Length, &Hash))
 						{
-							if(Length >= sizeof(UPDATE_LIST))
+							if(memcmp(&Hash, &UpdateHash.ListHash, 64) == 0)
 							{
-								bResult = TRUE;
-								pUpdateList = (UPDATE_LIST*)&Buf1;
-								if(pUpdateList->Version > *pVersion)
+								if(Length >= sizeof(UPDATE_LIST))
 								{
-									*pVersion = pUpdateList->Version;
-									_tcscpy(pVersionString, pUpdateList->VersionString);
+									bResult = TRUE;
+									pUpdateList = (UPDATE_LIST*)&Buf1;
+									if(pUpdateList->Version > *pVersion)
+									{
+										*pVersion = pUpdateList->Version;
+										_tcscpy(pVersionString, pUpdateList->VersionString);
+									}
+									if(bDownload)
+										bResult = PrepareUpdates(&Buf1, Length, DownloadDir);
 								}
-								if(bDownload)
-									bResult = PrepareUpdates(&Buf1, Length, DownloadDir);
 							}
 						}
 					}
@@ -240,14 +242,16 @@ BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir)
 				{
 					if(ReadFileViaHTTP(pBuf, 16777216, &Length, HTTP_USER_AGENT, UPDATE_SERVER, pUpdateList->File[i].SrcPath))
 					{
-						GetHashSHA512(pBuf, Length, &Hash);
-						if(memcmp(&Hash, &pUpdateList->File[i].SrcHash, 64) == 0)
+						if(GetHashSHA512(pBuf, Length, &Hash))
 						{
-							_tcscpy(Path, DownloadDir);
-							_tcscat(Path, _T("\\"));
-							_tcscat(Path, pUpdateList->File[i].DstPath);
-							if(SaveMemoryToFileWithTimestamp(Path, pBuf, Length, &pUpdateList->File[i].Timestamp))
-								b = TRUE;
+							if(memcmp(&Hash, &pUpdateList->File[i].SrcHash, 64) == 0)
+							{
+								_tcscpy(Path, DownloadDir);
+								_tcscat(Path, _T("\\"));
+								_tcscat(Path, pUpdateList->File[i].DstPath);
+								if(SaveMemoryToFileWithTimestamp(Path, pBuf, Length, &pUpdateList->File[i].Timestamp))
+									b = TRUE;
+							}
 						}
 					}
 				}