Commit: 36d3d8b9ff40fcc9ec7f84bd406d9ccdd0bf3c24 - ffftp (git)

Loweynet

Commit MetaInfo

• Revision: 36d3d8b9ff40fcc9ec7f84bd406d9ccdd0bf3c24 (tree)
• Zeit: 2011-10-16 02:42:25
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of SSL connection management.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: main.c
• modified: socketwrapper.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/main.c
+++ b/main.c
@@ -2837,10 +2837,15 @@ BOOL __stdcall SSLConfirmCallback(BOOL bVerified, LPCSTR Certificate, LPCSTR Com
 	char* pm0;
 	bResult = FALSE;
 	sha_memory((char*)Certificate, (uint32)(strlen(Certificate) * sizeof(char)), (uint32*)&Hash);
-	for(i = 0; i < MAX_CERT_CACHE_HASH; i++)
+	i = 0;
+	while(i < MAX_CERT_CACHE_HASH)
 	{
 		if(memcmp(&CertificateCacheHash[i], &Hash, 20) == 0)
+		{
 			bResult = TRUE;
+			break;
+		}
+		i++;
 	}
 	if(!bResult)
 	{

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -381,13 +381,18 @@ BOOL AttachSSL(SOCKET s, SOCKET parent)
 						}
 						EnterCriticalSection(&g_OpenSSLLock);
 					}
-					if(ConfirmSSLCertificate(*ppSSL))
+					if(r)
 					{
-					}
-					else
-					{
-						DetachSSL(s);
-						r = FALSE;
+						if(ConfirmSSLCertificate(*ppSSL))
+						{
+						}
+						else
+						{
+							LeaveCriticalSection(&g_OpenSSLLock);
+							DetachSSL(s);
+							r = FALSE;
+							EnterCriticalSection(&g_OpenSSLLock);
+						}
 					}
 				}
 				else
@@ -431,7 +436,7 @@ BOOL IsSSLAttached(SOCKET s)
 	ppSSL = FindSSLPointerFromSocket(s);
 	LeaveCriticalSection(&g_OpenSSLLock);
 	if(!ppSSL)
-		return TRUE;
+		return FALSE;
 	return TRUE;
 }