From eb22f70065df7001a70b1d04c42ca1c71d1c0efc Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Fri, 22 Jun 2018 20:28:33 +0200
Subject: Windows: in DEBUG mode, disable verification to Authenticode
 signature of binaries.

---
 src/Common/Dlgcode.c    | 6 +++++-
 src/Setup/SelfExtract.c | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 7d2fffba..48a5e852 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -2849,7 +2849,7 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine)
 
 	LoadSystemDll (L"Riched20.dll", &hRichEditDll, FALSE, SRC_POS);
 
-#if defined(NDEBUG) && !defined(SETUP)
+#if !defined(SETUP)
 	if (!VerifyModuleSignature (modPath))
 		AbortProcess ("DIST_PACKAGE_CORRUPTED");
 #endif
@@ -13459,6 +13459,7 @@ static void FinalizeWintrust()
 
 BOOL VerifyModuleSignature (const wchar_t* path)
 {
+#ifdef NDEBUG
 	BOOL bResult = FALSE;
 	HRESULT hResult;
 	GUID gActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2;
@@ -13526,6 +13527,9 @@ BOOL VerifyModuleSignature (const wchar_t* path)
 	FinalizeWintrust ();
 
 	return bResult;
+#else
+	return TRUE;
+#endif
 }
 
 void GetInstallationPath (HWND hwndDlg, wchar_t* szInstallPath, DWORD cchSize, BOOL* pbInstallPathDetermined)
diff --git a/src/Setup/SelfExtract.c b/src/Setup/SelfExtract.c
index 2a3a8b29..cf825104 100644
--- a/src/Setup/SelfExtract.c
+++ b/src/Setup/SelfExtract.c
@@ -401,14 +401,12 @@ BOOL VerifyPackageIntegrity (const wchar_t *path)
 	unsigned char *tmpBuffer;
 	int tmpFileSize;
 
-#ifdef NDEBUG
 	// verify Authenticode digital signature of the exe file
 	if (!VerifyModuleSignature (path))
 	{
 		Error ("DIST_PACKAGE_CORRUPTED", NULL);
 		return FALSE;
 	}
-#endif
 
 	fileDataEndPos = (int) FindStringInFile (path, MagEndMarker, strlen (MagEndMarker));
 	if (fileDataEndPos < 0)
-- 
cgit v1.2.3