1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00

Windows: use separate name for SetProcessMitigationPolicy function point. Remove unneeded boolean

This commit is contained in:
Mounir IDRASSI
2023-09-21 01:16:11 +02:00
parent 9e49a32942
commit 6c7e055f3f

View File

@@ -220,7 +220,6 @@ BOOL DisablePeriodicDeviceListUpdate = FALSE;
BOOL EnableMemoryProtection = FALSE; BOOL EnableMemoryProtection = FALSE;
BOOL MemoryProtectionActivated = FALSE; BOOL MemoryProtectionActivated = FALSE;
BOOL ProcessMitigationsActivated = FALSE;
BOOL WaitDialogDisplaying = FALSE; BOOL WaitDialogDisplaying = FALSE;
@@ -14232,13 +14231,10 @@ typedef enum _PROCESS_MITIGATION_POLICY {
void ActivateProcessMitigations() void ActivateProcessMitigations()
{ {
if (ProcessMitigationsActivated)
return;
// we load the function pointer of SetProcessMitigationPolicy dynamically because we are building with Windows 7 SDK that does not have the definition of this function // we load the function pointer of SetProcessMitigationPolicy dynamically because we are building with Windows 7 SDK that does not have the definition of this function
typedef BOOL (WINAPI *SetProcessMitigationPolicyFunc) (PROCESS_MITIGATION_POLICY MitigationPolicy, PVOID lpBuffer, SIZE_T dwLength); typedef BOOL (WINAPI *SetProcessMitigationPolicyFunc) (PROCESS_MITIGATION_POLICY MitigationPolicy, PVOID lpBuffer, SIZE_T dwLength);
SetProcessMitigationPolicyFunc SetProcessMitigationPolicy = (SetProcessMitigationPolicyFunc) GetProcAddress (GetModuleHandle (L"kernel32.dll"), "SetProcessMitigationPolicy"); SetProcessMitigationPolicyFunc SetProcessMitigationPolicyPtr = (SetProcessMitigationPolicyFunc) GetProcAddress (GetModuleHandle (L"kernel32.dll"), "SetProcessMitigationPolicy");
if (SetProcessMitigationPolicy) if (SetProcessMitigationPolicyPtr)
{ {
PROCESS_MITIGATION_ASLR_POLICY aslrPolicy = { 0 }; PROCESS_MITIGATION_ASLR_POLICY aslrPolicy = { 0 };
PROCESS_MITIGATION_DYNAMIC_CODE_POLICY dynCodePolicy = { 0 }; PROCESS_MITIGATION_DYNAMIC_CODE_POLICY dynCodePolicy = { 0 };
@@ -14252,12 +14248,10 @@ void ActivateProcessMitigations()
extensionPointDisablePolicy.DisableExtensionPoints = TRUE; extensionPointDisablePolicy.DisableExtensionPoints = TRUE;
SetProcessMitigationPolicy (ProcessASLRPolicy, &aslrPolicy, sizeof (aslrPolicy)); SetProcessMitigationPolicyPtr (ProcessASLRPolicy, &aslrPolicy, sizeof (aslrPolicy));
SetProcessMitigationPolicy (ProcessDynamicCodePolicy, &dynCodePolicy, sizeof (dynCodePolicy)); SetProcessMitigationPolicyPtr (ProcessDynamicCodePolicy, &dynCodePolicy, sizeof (dynCodePolicy));
SetProcessMitigationPolicy (ProcessExtensionPointDisablePolicy, &extensionPointDisablePolicy, sizeof (extensionPointDisablePolicy)); SetProcessMitigationPolicyPtr (ProcessExtensionPointDisablePolicy, &extensionPointDisablePolicy, sizeof (extensionPointDisablePolicy));
} }
ProcessMitigationsActivated = TRUE;
} }
// Based on sample code from: // Based on sample code from: