From 03867fbf5653c0260e71271e0ddf46ed1045b488 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 22 Jun 2013 17:34:53 +0200 Subject: Modifications to remove all TrueCrypt references in names. generate new GUIDs for VeraCrypt. Replace "TRUE" by "VERA" in volume headers and driver magic word. --- src/Driver/BuildDriver.cmd | 4 ++-- src/Driver/DriveFilter.c | 2 +- src/Driver/DriveFilter.h | 2 +- src/Driver/Driver.rc | 14 +++++++------- src/Driver/Driver.vcproj | 24 ++++++++++++------------ src/Driver/Ntdriver.c | 6 +++--- src/Driver/Sources | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src/Driver') diff --git a/src/Driver/BuildDriver.cmd b/src/Driver/BuildDriver.cmd index c9d78943..8d5854b6 100644 --- a/src/Driver/BuildDriver.cmd +++ b/src/Driver/BuildDriver.cmd @@ -143,7 +143,7 @@ popd if "%TC_ARG_CMD%"=="-clean" exit /B 0 md "%TC_COPY_DIR%\Setup Files" >NUL: 2>NUL: -copy /B /Y obj%TC_BUILD_ALT_DIR%\%TC_BUILD_ARCH_DIR%\truecrypt.sys "%TC_COPY_DIR%\Setup Files\truecrypt%TC_ARCH_SUFFIX%.sys" >NUL: +copy /B /Y obj%TC_BUILD_ALT_DIR%\%TC_BUILD_ARCH_DIR%\veracrypt.sys "%TC_COPY_DIR%\Setup Files\veracrypt%TC_ARCH_SUFFIX%.sys" >NUL: if errorlevel 1 ( echo BuildDriver.cmd: error: Cannot copy target. >&2 @@ -151,7 +151,7 @@ if errorlevel 1 ( ) if %TC_TEST_SIGN% equ 1 ( - signtool sign /s "%TC_KERNEL_TEST_CERTIFICATE_STORE%" /n "%TC_KERNEL_TEST_CERTIFICATE_NAME%" "%TC_COPY_DIR%\Setup Files\truecrypt%TC_ARCH_SUFFIX%.sys" >NUL: + signtool sign /s "%TC_KERNEL_TEST_CERTIFICATE_STORE%" /n "%TC_KERNEL_TEST_CERTIFICATE_NAME%" "%TC_COPY_DIR%\Setup Files\veracrypt%TC_ARCH_SUFFIX%.sys" >NUL: if errorlevel 1 ( echo BuildDriver.cmd: error: Cannot test-sign target. >&2 diff --git a/src/Driver/DriveFilter.c b/src/Driver/DriveFilter.c index 72adb86f..006b283a 100644 --- a/src/Driver/DriveFilter.c +++ b/src/Driver/DriveFilter.c @@ -443,7 +443,7 @@ static NTSTATUS SaveDriveVolumeHeader (DriveFilterExtension *Extension) DecryptBuffer (header + HEADER_ENCRYPTED_DATA_OFFSET, HEADER_ENCRYPTED_DATA_SIZE, Extension->HeaderCryptoInfo); - if (GetHeaderField32 (header, TC_HEADER_OFFSET_MAGIC) != 0x54525545) + if (GetHeaderField32 (header, TC_HEADER_OFFSET_MAGIC) != 0x56455241) { Dump ("Header not decrypted"); status = STATUS_UNKNOWN_REVISION; diff --git a/src/Driver/DriveFilter.h b/src/Driver/DriveFilter.h index ca3a75dd..96ec00ef 100644 --- a/src/Driver/DriveFilter.h +++ b/src/Driver/DriveFilter.h @@ -45,7 +45,7 @@ typedef struct _DriveFilterExtension } DriveFilterExtension; -#define TC_BOOT_DRIVE_FILTER_EXTENSION_MAGIC_NUMBER 0x5452554542455854 +#define TC_BOOT_DRIVE_FILTER_EXTENSION_MAGIC_NUMBER 0x5645524142455854 extern BOOL BootArgsValid; extern BootArguments BootArgs; diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index 6f1f9a9a..b44a9e55 100644 --- a/src/Driver/Driver.rc +++ b/src/Driver/Driver.rc @@ -43,13 +43,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "TrueCrypt Foundation" - VALUE "FileDescription", "TrueCrypt Driver" - VALUE "FileVersion", "7.1a" - VALUE "LegalTrademarks", "TrueCrypt" - VALUE "OriginalFilename", "truecrypt.sys" - VALUE "ProductName", "TrueCrypt" - VALUE "ProductVersion", "7.1a" + VALUE "CompanyName", "IDRIX" + VALUE "FileDescription", "VeraCrypt Driver" + VALUE "FileVersion", "1.10" + VALUE "LegalTrademarks", "VeraCrypt" + VALUE "OriginalFilename", "veracrypt.sys" + VALUE "ProductName", "VeraCrypt" + VALUE "ProductVersion", "1.0a" END END BLOCK "VarFileInfo" diff --git a/src/Driver/Driver.vcproj b/src/Driver/Driver.vcproj index 2021a2c3..7fe1d5fc 100644 --- a/src/Driver/Driver.vcproj +++ b/src/Driver/Driver.vcproj @@ -25,9 +25,9 @@ > DataLength - 9 * sizeof (wchar_t); ++i) { - if (memcmp (data->Data + i, L"truecrypt", 9 * sizeof (wchar_t)) == 0) + if (memcmp (data->Data + i, L"veracrypt", 9 * sizeof (wchar_t)) == 0) { Dump ("Volume class filter active\n"); registered = TRUE; @@ -3076,7 +3076,7 @@ NTSTATUS ReadRegistryConfigFlags (BOOL driverEntry) NTSTATUS status; uint32 flags = 0; - RtlInitUnicodeString (&name, L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\truecrypt"); + RtlInitUnicodeString (&name, L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\veracrypt"); status = TCReadRegistryKey (&name, TC_DRIVER_CONFIG_REG_VALUE_NAME, &data); if (NT_SUCCESS (status)) @@ -3118,7 +3118,7 @@ NTSTATUS ReadRegistryConfigFlags (BOOL driverEntry) NTSTATUS WriteRegistryConfigFlags (uint32 flags) { UNICODE_STRING name; - RtlInitUnicodeString (&name, L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\truecrypt"); + RtlInitUnicodeString (&name, L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\veracrypt"); return TCWriteRegistryKey (&name, TC_DRIVER_CONFIG_REG_VALUE_NAME, REG_DWORD, &flags, sizeof (flags)); } diff --git a/src/Driver/Sources b/src/Driver/Sources index 0cf6ff7f..592c2dc6 100644 --- a/src/Driver/Sources +++ b/src/Driver/Sources @@ -1,4 +1,4 @@ -TARGETNAME=truecrypt +TARGETNAME=veracrypt TARGETTYPE=DRIVER USER_C_FLAGS=$(USER_C_FLAGS) -D_UNICODE -- cgit v1.2.3