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: allow EFI repair to finalize stuck decryption

Browse Source
This commit is contained in:
Mounir IDRASSI
2026-04-26 18:36:54 +09:00
parent e0555e14f0
commit d841ac63e4
46 changed files with 177 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mount/Mount.c
+77 -14
View File
@@ -1312,20 +1312,10 @@ void SaveSettings (HWND hwndDlg)
NormalCursor ();
}
// Returns TRUE if system encryption or decryption had been or is in progress and has not been completed
static BOOL SysEncryptionOrDecryptionRequired (void)
static BOOL SysEncryptionOrDecryptionRequiredByCurrentStatus (void)
{
/* If you update this function, revise SysEncryptionOrDecryptionRequired() in Tcformat.c as well. */
try
{
BootEncStatus = BootEncObj->GetStatus();
}
catch (Exception &e)
{
e.Show (MainDlg);
}
return (SystemEncryptionStatus == SYSENC_STATUS_ENCRYPTING
|| SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING
||
@@ -1340,6 +1330,21 @@ static BOOL SysEncryptionOrDecryptionRequired (void)
);
}
// Returns TRUE if system encryption or decryption had been or is in progress and has not been completed
static BOOL SysEncryptionOrDecryptionRequired (void)
{
try
{
BootEncStatus = BootEncObj->GetStatus();
}
catch (Exception &e)
{
e.Show (MainDlg);
}
return SysEncryptionOrDecryptionRequiredByCurrentStatus ();
}
// Returns TRUE if system encryption master key is vulnerable
static BOOL SysEncryptionMasterKeyVulnerable (void)
{
@@ -6482,11 +6487,17 @@ static void RepairEfiBootLoader (HWND hwndDlg)
return;
}
BOOL bSysEncRequired = SysEncryptionOrDecryptionRequired ();
BOOL bFinalizeDecryption = (SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING
&& !BootEncStatus.SetupInProgress
&& !BootEncStatus.DriveEncrypted
&& !BootEncStatus.DriveMounted);
if (IsHiddenOSRunning()
|| BootEncStatus.SetupInProgress
|| BootEncStatus.DriveEncrypted
|| BootEncStatus.DriveMounted
|| SysEncryptionOrDecryptionRequired ())
|| (bSysEncRequired && !bFinalizeDecryption))
{
Warning ("EFI_BOOT_LOADER_REPAIR_BLOCKED", hwndDlg);
return;
@@ -6501,10 +6512,50 @@ static void RepairEfiBootLoader (HWND hwndDlg)
return;
}
LoadSysEncSettings ();
try
{
BootEncStatus = BootEncObj->GetStatus();
config = BootEncObj->GetSystemDriveConfiguration ();
}
catch (Exception &e)
{
CloseSysEncMutex ();
e.Show (hwndDlg);
return;
}
if (!config.SystemPartition.IsGPT)
{
CloseSysEncMutex ();
Warning ("EFI_BOOT_LOADER_REPAIR_NOT_APPLICABLE", hwndDlg);
return;
}
bSysEncRequired = SysEncryptionOrDecryptionRequiredByCurrentStatus ();
bFinalizeDecryption = (SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING
&& !BootEncStatus.SetupInProgress
&& !BootEncStatus.DriveEncrypted
&& !BootEncStatus.DriveMounted);
if (IsHiddenOSRunning()
|| BootEncStatus.SetupInProgress
|| BootEncStatus.DriveEncrypted
|| BootEncStatus.DriveMounted
|| (bSysEncRequired && !bFinalizeDecryption))
{
CloseSysEncMutex ();
Warning ("EFI_BOOT_LOADER_REPAIR_BLOCKED", hwndDlg);
return;
}
WaitCursor ();
try
{
BootEncObj->RestoreSystemLoader ();
if (bFinalizeDecryption)
BootEncObj->Deinstall (true);
else
BootEncObj->RestoreSystemLoader ();
}
catch (Exception &e)
{
@@ -6514,7 +6565,19 @@ static void RepairEfiBootLoader (HWND hwndDlg)
return;
}
NormalCursor ();
if (bFinalizeDecryption)
{
NormalCursor ();
if (!ClearSystemEncryptionStatus (hwndDlg))
{
CloseSysEncMutex ();
return;
}
ManageStartupSeqWiz (TRUE, L"");
}
else
NormalCursor ();
CloseSysEncMutex ();
Info ("EFI_BOOT_LOADER_REPAIR_SUCCESS", hwndDlg);
}