Build 1.2 Beta 2

Author: DavidXanatos

DCrypt/_include_/version.h

@@ -4,10 +4,10 @@
 
 #define DC_MAJOR_VER   1
 #define DC_MINOR_VER   2
-#define DC_DRIVER_VER  847  /* driver version */
+#define DC_DRIVER_VER  848  /* driver version */
 #define DC_BOOT_VER    118  /* bootloader version */
-#define DC_UEFI_VER    200  /* uefiloader version */
-#define DC_FILE_VER    "1.2 Beta 1"
+#define DC_UEFI_VER    201  /* uefiloader version */
+#define DC_FILE_VER    "1.2 Beta 2"
 #define DC_PRODUCT_VER "1.2"
 
 #endif

DCrypt/changes.txt

@@ -1,4 +1,13 @@
-[01.02.2020] - 1.2.846.118.200
+
+[14.03.2020] - 1.2.1/848.118.201
+  [*] Wipe Mode disabled on SSD drivers (as on those its pointless and may damage the ssd)
+  [+] Added option to mount volumes in read only mode
+  [*] Fixed some EFI config values not getting properly loaded by the API library
+  [*] Switched to using "fast" crypto implementation for the x64 UEFI bootloader
+  [+] Added Hardware Crypto support to the x64 UEFI bootloader
+  [*] Fixed issues updating the driver on Windows 10
+
+[01.02.2020] - 1.2.0/847.118.200
   [*] Project moved to Visual Studio 2017, using win 7 sdk for compatybility
   [+] Added EFI bootloader
   [+] Added shim bootloader to achieve secure boot compatibility (https://habr.com/ru/post/446238/)

DCrypt/crypto/crypto_fast/crypto_fast.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>

DCrypt/crypto/crypto_small/crypto_small.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>

DCrypt/crypto/tests/crypto_test_1.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>

DCrypt/crypto/tests/crypto_test_2.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>

DCrypt/dcapi/drv_ioctl.c

@@ -28,6 +28,7 @@
 #include "dcapi.h"
 #include <winternl.h>
 
+
 int dc_open_device()
 {
 	HANDLE h_device;
@@ -786,3 +787,28 @@ int dc_restore_header(wchar_t *device, dc_pass *password, void *in)
 
 	return resl;
 }
+
+int dc_is_device_ssd(wchar_t *device)
+{
+	int						result = 0;
+	DWORD					bytesReturned = 0;
+	HANDLE					hDevice;
+	STORAGE_PROPERTY_QUERY	spqTrim;
+	DEVICE_TRIM_DESCRIPTOR	dtd;
+	
+	hDevice = CreateFile(device, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+
+	if (hDevice != INVALID_HANDLE_VALUE)
+	{
+		spqTrim.PropertyId = StorageDeviceTrimProperty;
+		spqTrim.QueryType = PropertyStandardQuery;
+		if (DeviceIoControl(hDevice, IOCTL_STORAGE_QUERY_PROPERTY, &spqTrim, sizeof(spqTrim), &dtd, sizeof(dtd), &bytesReturned, NULL) && bytesReturned == sizeof(dtd))
+		{
+			result = dtd.TrimEnabled;
+		}
+
+		CloseHandle(hDevice);
+	}
+
+	return result;
+}

DCrypt/dcapi/drvinst.c

@@ -193,15 +193,32 @@ static DWORD make_driver_path(PTSTR pszPath, size_t cchPath, PCTSTR driver_name)
 
 static DWORD save_dcrypt_driver_file()
 {
-	TCHAR source_path[MAX_PATH], dest_path[MAX_PATH], *p;
+	TCHAR source_path[MAX_PATH], dest_path[MAX_PATH], temp_path[MAX_PATH], *p;
 	DWORD length, status;
 
 	if (g_inst_dll == NULL || (length = GetModuleFileName(g_inst_dll, source_path, _countof(source_path))) == 0) return ERROR_INVALID_NAME;
 	if (length >= _countof(source_path) - 1 || (p = _tcsrchr(source_path, '\\')) == NULL) return ERROR_INVALID_NAME;
 	if ( FAILED(StringCchCopy(p + 1, _countof(source_path) - (p - source_path) - 1, g_maindriver_filename)) ) return ERROR_INSUFFICIENT_BUFFER;
 
 	if ( (status = make_driver_path(dest_path, _countof(dest_path), g_maindriver_filename)) != NO_ERROR ) return status;
+	
+	if ( (status = make_driver_path(temp_path, _countof(temp_path), _T("dcrypt_old.sys"))) != NO_ERROR ) return status;
+
+	// Note: we can not overwrite a driver in use we need to rename it and remove it upon reboot
+
+	// rename old driver if present
+	if (_waccess(dest_path, 0) != -1) {
+		if (MoveFileEx(dest_path, temp_path, MOVEFILE_REPLACE_EXISTING) == FALSE) return GetLastError();
+	}
+
+	// copy new driver
 	if ( CopyFile(source_path, dest_path, FALSE) == FALSE ) return GetLastError();
+
+	// schedule deleting of old driver
+	if (_waccess(temp_path, 0) != -1) {
+		if (MoveFileEx(temp_path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) == FALSE) return GetLastError();
+	}
+	
 	return NO_ERROR;
 }
 

DCrypt/dcapi/efiinst.c

@@ -1102,6 +1102,7 @@ int dc_efi_config_write(const wchar_t* root, ldr_config *conf)
 
 	// Other
 
+		WriteConfigInteger(configFile, configContent, "UseHardwareCrypto", (conf->options & LDR_OP_HW_CRYPTO) ? 1 : 0);
 
 		WriteConfigInteger(configFile, configContent, "VerboseDebug", (conf->logon_type & LDR_LT_DEBUG) ? 1 : 0);
 
@@ -1275,21 +1276,24 @@ int dc_efi_config_read(const wchar_t* root, ldr_config *conf)
 			// Load Boot Disk MBR			"cancel"	EFI_DCS_USER_CANCELED
 			//								"shutdown"  EFI_DCS_SHUTDOWN_REQUESTED
 		ReadConfigString(configContent, "ActionFailed", "exit", buffer, sizeof(buffer));
-		if (_strcmpi(buffer, "Reboot"))
+		if (_strcmpi(buffer, "Reboot") == 0)
 			conf->error_type |= LDR_ET_REBOOT;
-		else if (_strcmpi(buffer, "Cancel"))
+		else if (_strcmpi(buffer, "Cancel") == 0)
 			//conf->error_type |= LDR_ET_BOOT_ACTIVE;
 			conf->error_type |= LDR_ET_MBR_BOOT;
-		//else if(strcmpi(buffer, "Exit"))
+		//else if(_strcmpi(buffer, "Exit") == 0)
 		//	conf->error_type |= LDR_ET_RETRY;
 
 		// Authentication Tries - new
 		if (ReadConfigInteger(configContent, "AuthorizeRetry", 100)) {
-			conf->options |= LDR_ET_RETRY;
+			conf->error_type |= LDR_ET_RETRY;
 		}
 
 	// Other
 
+		if (ReadConfigInteger(configContent, "UseHardwareCrypto", 1)) {
+			conf->options |= LDR_OP_HW_CRYPTO;
+		}
 
 		if (ReadConfigInteger(configContent, "VerboseDebug", 0)) {
 			conf->logon_type |= LDR_LT_DEBUG;

DCrypt/dcapi/include/drv_ioctl.h

@@ -55,4 +55,6 @@ void dc_api dc_get_bsod();
 int dc_api dc_backup_header(wchar_t *device, dc_pass *password, void *out);
 int dc_api dc_restore_header(wchar_t *device, dc_pass *password, void *in);
 
+int dc_api dc_is_device_ssd(wchar_t *device);
+
 #endif