VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2018-06-22 18:28:33 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2018-06-23 23:15:23 (GMT)
commiteb22f70065df7001a70b1d04c42ca1c71d1c0efc (patch)
treef4a61d801d21384419755c22b555a9074393b76c /src
parent22b9ca94b3b863c734d3733f235383b8388d61ee (diff)
downloadVeraCrypt-eb22f70065df7001a70b1d04c42ca1c71d1c0efc.zip
VeraCrypt-eb22f70065df7001a70b1d04c42ca1c71d1c0efc.tar.gz
Windows: in DEBUG mode, disable verification to Authenticode signature of binaries.
Diffstat (limited to 'src')
-rw-r--r--src/Common/Dlgcode.c6
-rw-r--r--src/Setup/SelfExtract.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 7d2fffb..48a5e85 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 2a3a8b2..cf82510 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)