Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-05-21 21:30:48 -05:00
Code Activity

Windows: detect VeraCrypt loader before Windows loader

Browse Source
This commit is contained in:
Mounir IDRASSI
2026-04-26 18:36:26 +09:00
parent df4e755112
commit e0555e14f0
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Common/BootEncryption.cpp
+19 -6
View File
@@ -3050,21 +3050,31 @@ namespace VeraCrypt
return BufferHasPattern (fileContent.data (), fileContent.size (), pattern, patternLen); return BufferHasPattern (fileContent.data (), fileContent.size (), pattern, patternLen);
} }
static bool BufferHasVeraCryptBootLoaderPattern (const std::vector<uint8>& fileContent)
{
const wchar_t* appName = _T(TC_APP_NAME);
return BufferHasPattern (fileContent.data (), fileContent.size (), appName, wcslen (appName) * sizeof (wchar_t))
|| BufferHasPattern (fileContent.data (), fileContent.size (), TC_APP_NAME, strlen (TC_APP_NAME));
}
bool EfiBoot::IsVeraCryptBootLoader (const wchar_t* name) bool EfiBoot::IsVeraCryptBootLoader (const wchar_t* name)
{ {
std::vector<uint8> fileContent; std::vector<uint8> fileContent;
if (!ReadFileToBuffer (name, fileContent)) if (!ReadFileToBuffer (name, fileContent))
return false; return false;
const wchar_t* appName = _T(TC_APP_NAME); return BufferHasVeraCryptBootLoaderPattern (fileContent);
return BufferHasPattern (fileContent.data (), fileContent.size (), appName, wcslen (appName) * sizeof (wchar_t))
|| BufferHasPattern (fileContent.data (), fileContent.size (), TC_APP_NAME, strlen (TC_APP_NAME));
} }
bool EfiBoot::IsWindowsBootLoader (const wchar_t* name) bool EfiBoot::IsWindowsBootLoader (const wchar_t* name)
{ {
std::vector<uint8> fileContent;
if (!ReadFileToBuffer (name, fileContent))
return false;
const char* g_szMsBootString = "bootmgfw.pdb"; const char* g_szMsBootString = "bootmgfw.pdb";
return FileHasPattern (name, g_szMsBootString, strlen (g_szMsBootString)); return !BufferHasVeraCryptBootLoaderPattern (fileContent)
&& BufferHasPattern (fileContent.data (), fileContent.size (), g_szMsBootString, strlen (g_szMsBootString));
} }
void EfiBoot::SaveFile(const wchar_t* name, uint8* data, DWORD size) { void EfiBoot::SaveFile(const wchar_t* name, uint8* data, DWORD size) {
@@ -4597,9 +4607,11 @@ namespace VeraCrypt
const wchar_t * szStdEfiBootloader = L"\\EFI\\Boot\\bootx64.efi"; const wchar_t * szStdEfiBootloader = L"\\EFI\\Boot\\bootx64.efi";
const wchar_t * szBackupEfiBootloader = L"\\EFI\\Boot\\original_bootx64.vc_backup"; const wchar_t * szBackupEfiBootloader = L"\\EFI\\Boot\\original_bootx64.vc_backup";
if (!EfiBootInst.FileExists (szStdEfiBootloader) || !EfiBootInst.IsWindowsBootLoader (szStdEfiBootloader))
EfiBootInst.RenameFile(szBackupEfiBootloader, szStdEfiBootloader, TRUE); EfiBootInst.RenameFile(szBackupEfiBootloader, szStdEfiBootloader, TRUE);
if (!EfiBootInst.RenameFile(szBackupMsBootloader, szStdMsBootloader, TRUE)) if ((!EfiBootInst.FileExists (szStdMsBootloader) || !EfiBootInst.IsWindowsBootLoader (szStdMsBootloader))
&& !EfiBootInst.RenameFile(szBackupMsBootloader, szStdMsBootloader, TRUE))
{ {
EfiBootConf conf; EfiBootConf conf;
if (EfiBootInst.ReadConfig (L"\\EFI\\VeraCrypt\\DcsProp", conf) && strlen (conf.actionSuccessValue.c_str())) if (EfiBootInst.ReadConfig (L"\\EFI\\VeraCrypt\\DcsProp", conf) && strlen (conf.actionSuccessValue.c_str()))
@@ -4621,7 +4633,8 @@ namespace VeraCrypt
EfiBootInst.ReadFile(loaderPath.c_str(), &bootLoaderBuf[0], (DWORD) loaderSize); EfiBootInst.ReadFile(loaderPath.c_str(), &bootLoaderBuf[0], (DWORD) loaderSize);
// look for bootmgfw.efi identifiant string // look for bootmgfw.efi identifiant string
if (BufferHasPattern (bootLoaderBuf.data (), (size_t) loaderSize, g_szMsBootString, strlen (g_szMsBootString))) if (BufferHasPattern (bootLoaderBuf.data (), (size_t) loaderSize, g_szMsBootString, strlen (g_szMsBootString))
&& !BufferHasVeraCryptBootLoaderPattern (bootLoaderBuf))
{ {
EfiBootInst.RenameFile(loaderPath.c_str(), szStdMsBootloader, TRUE); EfiBootInst.RenameFile(loaderPath.c_str(), szStdMsBootloader, TRUE);
} }