From b48d437c80f8011548383a2e1ae88649a030c1ae Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 11 Dec 2020 23:26:45 +0100 Subject: Windows Driver: Fix build error using Windows 10 WDK caused by name conflict for KeSaveExtendedProcessorState/KeRestoreExtendedProcessorState functions --- src/Common/Pkcs5.c | 16 ++++++++-------- src/Common/Tcdefs.h | 4 ++-- src/Crypto/Camellia.c | 8 ++++---- src/Driver/DriveFilter.c | 4 ++-- src/Driver/Ntdriver.c | 4 ++-- 5 files changed, 18 insertions(+), 18 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 ); diff --git a/src/Crypto/Camellia.c b/src/Crypto/Camellia.c index b3a35784..f4fde8aa 100644 --- a/src/Crypto/Camellia.c +++ b/src/Crypto/Camellia.c @@ -1100,7 +1100,7 @@ void camellia_encrypt_blocks(unsigned __int8 *instance, const byte* in_blk, byte { #if defined (TC_WINDOWS_DRIVER) XSTATE_SAVE SaveState; - if (NT_SUCCESS (KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState))) + if (NT_SUCCESS (KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState))) { #endif while (blockCount >= 16) @@ -1111,7 +1111,7 @@ void camellia_encrypt_blocks(unsigned __int8 *instance, const byte* in_blk, byte blockCount -= 16; } #if defined (TC_WINDOWS_DRIVER) - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); } #endif } @@ -1136,7 +1136,7 @@ void camellia_decrypt_blocks(unsigned __int8 *instance, const byte* in_blk, byte { #if defined (TC_WINDOWS_DRIVER) XSTATE_SAVE SaveState; - if (NT_SUCCESS (KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState))) + if (NT_SUCCESS (KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState))) { #endif while (blockCount >= 16) @@ -1147,7 +1147,7 @@ void camellia_decrypt_blocks(unsigned __int8 *instance, const byte* in_blk, byte blockCount -= 16; } #if defined (TC_WINDOWS_DRIVER) - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); } #endif } diff --git a/src/Driver/DriveFilter.c b/src/Driver/DriveFilter.c index f89e6e9a..a12b1ec0 100644 --- a/src/Driver/DriveFilter.c +++ b/src/Driver/DriveFilter.c @@ -363,7 +363,7 @@ static void ComputeBootLoaderFingerprint(PDEVICE_OBJECT LowerDeviceObject, byte* #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 (HasISSE() || (HasSSSE3() && HasMMX())) @@ -405,7 +405,7 @@ static void ComputeBootLoaderFingerprint(PDEVICE_OBJECT LowerDeviceObject, byte* if (NT_SUCCESS (saveStatus)) #ifdef _WIN64 - KeRestoreExtendedProcessorState(&SaveState); + KeRestoreExtendedProcessorStateVC(&SaveState); #else KeRestoreFloatingPointState (&floatingPointState); #endif diff --git a/src/Driver/Ntdriver.c b/src/Driver/Ntdriver.c index 957853cd..a05335f2 100644 --- a/src/Driver/Ntdriver.c +++ b/src/Driver/Ntdriver.c @@ -4940,7 +4940,7 @@ BOOL IsOSAtLeast (OSVersionEnum reqMinOS) >= (major << 16 | minor << 8)); } -NTSTATUS NTAPI KeSaveExtendedProcessorState ( +NTSTATUS NTAPI KeSaveExtendedProcessorStateVC ( __in ULONG64 Mask, PXSTATE_SAVE XStateSave ) @@ -4955,7 +4955,7 @@ NTSTATUS NTAPI KeSaveExtendedProcessorState ( } } -VOID NTAPI KeRestoreExtendedProcessorState ( +VOID NTAPI KeRestoreExtendedProcessorStateVC ( PXSTATE_SAVE XStateSave ) { -- cgit v1.2.3