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

Windows: Update EFI NVRAM variable only if changed or doesn't exist and add configuration to force setting EFI BootNext to veraCrypt bootloader before each shutdown

Browse Source
This commit is contained in:
Mounir IDRASSI 2019-10-26 22:49:37 +02:00
parent f22abf93dd
commit ca46cf928a
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Common/BootEncryption.cpp
View File

@ -1030,7 +1030,7 @@ namespace VeraCrypt
static EfiBoot EfiBootInst; static EfiBoot EfiBootInst;
BootEncryption::BootEncryption (HWND parent, bool postOOBE) BootEncryption::BootEncryption (HWND parent, bool postOOBE, bool setBootNext)
: DriveConfigValid (false), : DriveConfigValid (false),
ParentWindow (parent), ParentWindow (parent),
RealSystemDriveSizeValid (false), RealSystemDriveSizeValid (false),
@ -1041,7 +1041,8 @@ namespace VeraCrypt
SelectedEncryptionAlgorithmId (0), SelectedEncryptionAlgorithmId (0),
SelectedPrfAlgorithmId (0), SelectedPrfAlgorithmId (0),
VolumeHeaderValid (false), VolumeHeaderValid (false),
PostOOBEMode (postOOBE) PostOOBEMode (postOOBE),
SetBootNext (setBootNext)
{ {
HiddenOSCandidatePartition.IsGPT = FALSE; HiddenOSCandidatePartition.IsGPT = FALSE;
HiddenOSCandidatePartition.Number = (size_t) -1; HiddenOSCandidatePartition.Number = (size_t) -1;
@ -2693,7 +2694,7 @@ namespace VeraCrypt
} }
} }
void EfiBoot::SetStartExec(wstring description, wstring execPath, uint16 statrtOrderNum , wchar_t* type, uint32 attr) { void EfiBoot::SetStartExec(wstring description, wstring execPath, bool setBootNext, uint16 statrtOrderNum , wchar_t* type, uint32 attr) {
SetPrivilege(SE_SYSTEM_ENVIRONMENT_NAME, TRUE); SetPrivilege(SE_SYSTEM_ENVIRONMENT_NAME, TRUE);
// Check EFI // Check EFI
if (!IsEfiBoot()) { if (!IsEfiBoot()) {
@ -2783,8 +2784,14 @@ namespace VeraCrypt
// Set variable // Set variable
wchar_t varName[256]; wchar_t varName[256];
StringCchPrintfW(varName, ARRAYSIZE (varName), L"%s%04X", type == NULL ? L"Boot" : type, statrtOrderNum); StringCchPrintfW(varName, ARRAYSIZE (varName), L"%s%04X", type == NULL ? L"Boot" : type, statrtOrderNum);
// only set value if it doesn't already exist
byte* existingVar = new byte[varSize];
DWORD existingVarLen = GetFirmwareEnvironmentVariableW (varName, EfiVarGuid, existingVar, varSize);
if ((existingVarLen != varSize) || (0 != memcmp (existingVar, startVar, varSize)))
SetFirmwareEnvironmentVariable(varName, EfiVarGuid, startVar, varSize); SetFirmwareEnvironmentVariable(varName, EfiVarGuid, startVar, varSize);
delete [] startVar; delete [] startVar;
delete [] existingVar;
// Update order // Update order
wstring order = L"Order"; wstring order = L"Order";
@ -2821,6 +2828,8 @@ namespace VeraCrypt
SetFirmwareEnvironmentVariable(order.c_str(), EfiVarGuid, startOrder, startOrderLen); SetFirmwareEnvironmentVariable(order.c_str(), EfiVarGuid, startOrder, startOrderLen);
} }
if (setBootNext)
{
// set BootNext value // set BootNext value
wstring next = L"Next"; wstring next = L"Next";
next.insert(0, type == NULL ? L"Boot" : type); next.insert(0, type == NULL ? L"Boot" : type);
@ -2828,6 +2837,7 @@ namespace VeraCrypt
SetFirmwareEnvironmentVariable(next.c_str(), EfiVarGuid, &statrtOrderNum, 2); SetFirmwareEnvironmentVariable(next.c_str(), EfiVarGuid, &statrtOrderNum, 2);
} }
}
bool EfiBoot::CompareFiles (const wchar_t* fileName1, const wchar_t* fileName2) bool EfiBoot::CompareFiles (const wchar_t* fileName1, const wchar_t* fileName2)
{ {
@ -3329,7 +3339,7 @@ namespace VeraCrypt
// restore boot menu entry in case of PostOOBE // restore boot menu entry in case of PostOOBE
if (PostOOBEMode) if (PostOOBEMode)
EfiBootInst.SetStartExec(L"VeraCrypt BootLoader (DcsBoot)", L"\\EFI\\VeraCrypt\\DcsBoot.efi"); EfiBootInst.SetStartExec(L"VeraCrypt BootLoader (DcsBoot)", L"\\EFI\\VeraCrypt\\DcsBoot.efi", SetBootNext);
if (EfiBootInst.FileExists (L"\\EFI\\Microsoft\\Boot\\bootmgfw_ms.vc")) if (EfiBootInst.FileExists (L"\\EFI\\Microsoft\\Boot\\bootmgfw_ms.vc"))
{ {

6
src/Common/BootEncryption.h
View File

@ -205,7 +205,7 @@ namespace VeraCrypt
bool IsEfiBoot(); bool IsEfiBoot();
void DeleteStartExec(uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL); void DeleteStartExec(uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL);
void SetStartExec(wstring description, wstring execPath, uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL, uint32 attr = 1); void SetStartExec(wstring description, wstring execPath, bool setBootNext = true, uint16 statrtOrderNum = 0xDC5B, wchar_t* type = NULL, uint32 attr = 1);
void SaveFile(const wchar_t* name, byte* data, DWORD size); void SaveFile(const wchar_t* name, byte* data, DWORD size);
void GetFileSize(const wchar_t* name, unsigned __int64& size); void GetFileSize(const wchar_t* name, unsigned __int64& size);
void ReadFile(const wchar_t* name, byte* data, DWORD size); void ReadFile(const wchar_t* name, byte* data, DWORD size);
@ -237,7 +237,7 @@ namespace VeraCrypt
class BootEncryption class BootEncryption
{ {
public: public:
BootEncryption (HWND parent, bool postOOBE = false); BootEncryption (HWND parent, bool postOOBE = false, bool setBootNext = false);
~BootEncryption (); ~BootEncryption ();
enum FilterType enum FilterType
@ -349,6 +349,7 @@ namespace VeraCrypt
bool RescueVolumeHeaderValid; bool RescueVolumeHeaderValid;
bool VolumeHeaderValid; bool VolumeHeaderValid;
bool PostOOBEMode; bool PostOOBEMode;
bool SetBootNext;
}; };
} }
@ -366,6 +367,7 @@ namespace VeraCrypt
#define VC_SYSTEM_FAVORITES_SERVICE_ARG_SKIP_MOUNT L"/SkipMount" #define VC_SYSTEM_FAVORITES_SERVICE_ARG_SKIP_MOUNT L"/SkipMount"
#define VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER 0x1 #define VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER 0x1
#define VC_SYSTEM_FAVORITES_SERVICE_CONFIG_FORCE_SET_BOOTNEXT 0x2
#define VC_WINDOWS_UPGRADE_POSTOOBE_CMDLINE_OPTION L"/PostOOBE" #define VC_WINDOWS_UPGRADE_POSTOOBE_CMDLINE_OPTION L"/PostOOBE"

5
src/Mount/Mount.c
View File

@ -9430,7 +9430,10 @@ static DWORD WINAPI SystemFavoritesServiceCtrlHandler ( DWORD dwControl,
if (!BootEncStatus.HiddenSystem) if (!BootEncStatus.HiddenSystem)
{ {
// re-install our bootloader again in case the update process has removed it. // re-install our bootloader again in case the update process has removed it.
BootEncryption bootEnc (NULL, true); bool bForceSetNextBoot = false;
if (BootEncObj->ReadServiceConfigurationFlags () & VC_SYSTEM_FAVORITES_SERVICE_CONFIG_FORCE_SET_BOOTNEXT)
bForceSetNextBoot = true;
BootEncryption bootEnc (NULL, true, bForceSetNextBoot);
bootEnc.InstallBootLoader (true); bootEnc.InstallBootLoader (true);
} }
} }