diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2020-12-11 23:26:45 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2020-12-11 23:42:08 +0100 |
| commit | b48d437c80f8011548383a2e1ae88649a030c1ae (patch) | |
| tree | 8de0d72b96937eb166524d0e28335689359717e4 /src/Common | |
| parent | c44127fe3bbecbd5df38a77efe899b8e98d2b4b3 (diff) | |
| download | VeraCrypt-b48d437c80f8011548383a2e1ae88649a030c1ae.tar.gz VeraCrypt-b48d437c80f8011548383a2e1ae88649a030c1ae.zip | |
Windows Driver: Fix build error using Windows 10 WDK caused by name conflict for KeSaveExtendedProcessorState/KeRestoreExtendedProcessorState functions
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/Pkcs5.c | 16 | ||||
| -rw-r--r-- | src/Common/Tcdefs.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Common/Pkcs5.c b/src/Common/Pkcs5.c index 93e748a1..3c0c6a97 100644 --- a/src/Common/Pkcs5.c +++ b/src/Common/Pkcs5.c @@ -92,7 +92,7 @@ void hmac_sha256 #ifdef _WIN64 XSTATE_SAVE SaveState; if (g_isIntel && HasSAVX()) - saveStatus = KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState); + saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState); #else KFLOATING_SAVE floatingPointState; if (HasSSE2()) @@ -143,7 +143,7 @@ void hmac_sha256 #if defined (DEVICE_DRIVER) if (NT_SUCCESS (saveStatus)) #ifdef _WIN64 - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); #else KeRestoreFloatingPointState (&floatingPointState); #endif @@ -219,7 +219,7 @@ void derive_key_sha256 (char *pwd, int pwd_len, char *salt, int salt_len, uint32 #ifdef _WIN64 XSTATE_SAVE SaveState; if (g_isIntel && HasSAVX()) - saveStatus = KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState); + saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState); #else KFLOATING_SAVE floatingPointState; if (HasSSE2()) @@ -292,7 +292,7 @@ void derive_key_sha256 (char *pwd, int pwd_len, char *salt, int salt_len, uint32 #if defined (DEVICE_DRIVER) if (NT_SUCCESS (saveStatus)) #ifdef _WIN64 - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); #else KeRestoreFloatingPointState (&floatingPointState); #endif @@ -362,7 +362,7 @@ void hmac_sha512 #ifdef _WIN64 XSTATE_SAVE SaveState; if (g_isIntel && HasSAVX()) - saveStatus = KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState); + saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState); #else KFLOATING_SAVE floatingPointState; if (HasSSSE3() && HasMMX()) @@ -414,7 +414,7 @@ void hmac_sha512 #if defined (DEVICE_DRIVER) if (NT_SUCCESS (saveStatus)) #ifdef _WIN64 - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); #else KeRestoreFloatingPointState (&floatingPointState); #endif @@ -464,7 +464,7 @@ void derive_key_sha512 (char *pwd, int pwd_len, char *salt, int salt_len, uint32 #ifdef _WIN64 XSTATE_SAVE SaveState; if (g_isIntel && HasSAVX()) - saveStatus = KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState); + saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState); #else KFLOATING_SAVE floatingPointState; if (HasSSSE3() && HasMMX()) @@ -537,7 +537,7 @@ void derive_key_sha512 (char *pwd, int pwd_len, char *salt, int salt_len, uint32 #if defined (DEVICE_DRIVER) if (NT_SUCCESS (saveStatus)) #ifdef _WIN64 - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); #else KeRestoreFloatingPointState (&floatingPointState); #endif diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index e3ed65fa..95aaf153 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -310,13 +310,13 @@ typedef ULONG (NTAPI *KeQueryActiveProcessorCountExFn)( USHORT GroupNumber ); -extern NTSTATUS NTAPI KeSaveExtendedProcessorState ( +extern NTSTATUS NTAPI KeSaveExtendedProcessorStateVC ( __in ULONG64 Mask, PXSTATE_SAVE XStateSave ); -extern VOID NTAPI KeRestoreExtendedProcessorState ( +extern VOID NTAPI KeRestoreExtendedProcessorStateVC ( PXSTATE_SAVE XStateSave ); |