nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-13 06:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: compatibility with multi-OS boot configuration by only setting VeraCrypt as first bootloader of the system if the current first bootloader is Windows one.

Browse Source
This commit is contained in:
Mounir IDRASSI 2019-11-27 00:13:25 +01:00
parent 79eea6e5b1
commit 14a477026d
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Common/BootEncryption.cpp
View File

@ -2824,11 +2824,30 @@ namespace VeraCrypt
if (setBootEntry) if (setBootEntry)
{ {
// check if first entry in BootOrder is Windows one
bool bFirstEntryIsWindows = false;
if (startOrderNumPos != 0)
{
wchar_t varName[256];
StringCchPrintfW(varName, ARRAYSIZE (varName), L"%s%04X", type == NULL ? L"Boot" : type, startOrder[0]);
byte* existingVar = new byte[512];
DWORD existingVarLen = GetFirmwareEnvironmentVariableW (varName, EfiVarGuid, existingVar, 512);
if (existingVarLen > 0)
{
if (BufferContainsWideString (existingVar, existingVarLen, L"EFI\\Microsoft\\Boot\\bootmgfw.efi"))
bFirstEntryIsWindows = true;
}
delete [] existingVar;
}
// Create new entry if absent // Create new entry if absent
if (startOrderNumPos == UINT_MAX) { if (startOrderNumPos == UINT_MAX) {
if (bDeviceInfoValid) if (bDeviceInfoValid)
{ {
if (forceFirstBootEntry) if (forceFirstBootEntry && bFirstEntryIsWindows)
{ {
for (uint32 i = startOrderLen / 2; i > 0; --i) { for (uint32 i = startOrderLen / 2; i > 0; --i) {
startOrder[i] = startOrder[i - 1]; startOrder[i] = startOrder[i - 1];
@ -2842,7 +2861,7 @@ namespace VeraCrypt
startOrderLen += 2; startOrderLen += 2;
startOrderUpdate = true; startOrderUpdate = true;
} }
} else if ((startOrderNumPos > 0) && forceFirstBootEntry) { } else if ((startOrderNumPos > 0) && forceFirstBootEntry && bFirstEntryIsWindows) {
for (uint32 i = startOrderNumPos; i > 0; --i) { for (uint32 i = startOrderNumPos; i > 0; --i) {
startOrder[i] = startOrder[i - 1]; startOrder[i] = startOrder[i - 1];
} }

22
src/Common/Dlgcode.c
View File

@ -12685,19 +12685,16 @@ void CheckFilesystem (HWND hwndDlg, int driveNo, BOOL fixErrors)
ShellExecuteW (NULL, (!IsAdmin() && IsUacSupported()) ? L"runas" : L"open", cmdPath, param, NULL, SW_SHOW); ShellExecuteW (NULL, (!IsAdmin() && IsUacSupported()) ? L"runas" : L"open", cmdPath, param, NULL, SW_SHOW);
} }
BOOL BufferContainsPattern (const byte *buffer, size_t bufferSize, const byte *pattern, size_t patternSize)
BOOL BufferContainsString (const byte *buffer, size_t bufferSize, const char *str)
{ {
size_t strLen = strlen (str); if (bufferSize < patternSize)
if (bufferSize < strLen)
return FALSE; return FALSE;
bufferSize -= strLen; bufferSize -= patternSize;
for (size_t i = 0; i < bufferSize; ++i) for (size_t i = 0; i < bufferSize; ++i)
{ {
if (memcmp (buffer + i, str, strLen) == 0) if (memcmp (buffer + i, pattern, patternSize) == 0)
return TRUE; return TRUE;
} }
@ -12705,6 +12702,17 @@ BOOL BufferContainsString (const byte *buffer, size_t bufferSize, const char *st
} }
BOOL BufferContainsString (const byte *buffer, size_t bufferSize, const char *str)
{
return BufferContainsPattern (buffer, bufferSize, (const byte*) str, strlen (str));
}
BOOL BufferContainsWideString (const byte *buffer, size_t bufferSize, const wchar_t *str)
{
return BufferContainsPattern (buffer, bufferSize, (const byte*) str, 2 * wcslen (str));
}
#ifndef SETUP #ifndef SETUP
int AskNonSysInPlaceEncryptionResume (HWND hwndDlg, BOOL *pbDecrypt) int AskNonSysInPlaceEncryptionResume (HWND hwndDlg, BOOL *pbDecrypt)

2
src/Common/Dlgcode.h
View File

@ -509,7 +509,9 @@ BOOL InitSecurityTokenLibrary (HWND hwndDlg);
BOOL FileHasReadOnlyAttribute (const wchar_t *path); BOOL FileHasReadOnlyAttribute (const wchar_t *path);
BOOL IsFileOnReadOnlyFilesystem (const wchar_t *path); BOOL IsFileOnReadOnlyFilesystem (const wchar_t *path);
void CheckFilesystem (HWND hwndDlg, int driveNo, BOOL fixErrors); void CheckFilesystem (HWND hwndDlg, int driveNo, BOOL fixErrors);
BOOL BufferContainsPattern (const byte *buffer, size_t bufferSize, const byte *pattern, size_t patternSize);
BOOL BufferContainsString (const byte *buffer, size_t bufferSize, const char *str); BOOL BufferContainsString (const byte *buffer, size_t bufferSize, const char *str);
BOOL BufferContainsWideString (const byte *buffer, size_t bufferSize, const wchar_t *str);
int AskNonSysInPlaceEncryptionResume (HWND hwndDlg, BOOL* pbDecrypt); int AskNonSysInPlaceEncryptionResume (HWND hwndDlg, BOOL* pbDecrypt);
BOOL RemoveDeviceWriteProtection (HWND hwndDlg, wchar_t *devicePath); BOOL RemoveDeviceWriteProtection (HWND hwndDlg, wchar_t *devicePath);
void EnableElevatedCursorChange (HWND parent); void EnableElevatedCursorChange (HWND parent);