From c4d4ade9d00e65112b93640bd3a0eeb50279a202 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 13 Aug 2016 02:40:45 +0200 Subject: Windows: Show only supported encryption algorithm in the system encryption wizard for MBR --- src/Format/Tcformat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Format') diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index 186c1199..248898c3 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c @@ -4060,6 +4060,9 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { int ea, hid; wchar_t buf[100]; + BOOL bIsGPT = FALSE; + if (SysEncInEffect ()) + bIsGPT = BootEncObj->GetSystemDriveConfiguration().SystemPartition.IsGPT; // Encryption algorithms @@ -4072,7 +4075,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa for (ea = EAGetFirst (); ea != 0; ea = EAGetNext (ea)) { - if (EAIsFormatEnabled (ea)) + if (EAIsFormatEnabled (ea) && (!SysEncInEffect () || bIsGPT || EAIsMbrSysEncEnabled (ea))) AddComboPair (GetDlgItem (hwndDlg, IDC_COMBO_BOX), EAGetName (buf, ea, 1), ea); } @@ -4086,7 +4089,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa if (SysEncInEffect ()) { - BOOL bIsGPT = BootEncObj->GetSystemDriveConfiguration().SystemPartition.IsGPT; hash_algo = bIsGPT? SHA512 : DEFAULT_HASH_ALGORITHM_BOOT; RandSetHashFunction (hash_algo); -- cgit v1.2.3