Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Windows: when Secure Desktop is enabled, use it for Mount Options dialog if it is displayed before password dialog (e.g. using menu Volumes > Mount Volume with Options) since it may contains the password for hidden volume.

Browse Source
This commit is contained in:
Mounir IDRASSI
2018-04-05 16:47:10 +02:00
parent 431aae0201
commit ad7eb74960
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mount/Mount.c
View File

@@ -7637,7 +7637,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5; mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
mountOptions.ProtectedHidVolPim = CmdVolumePim; mountOptions.ProtectedHidVolPim = CmdVolumePim;
if (IDCANCEL == DialogBoxParamW (hInst, if (IDCANCEL == SecureDesktopDialogBoxParam (hInst,
MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwndDlg, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwndDlg,
(DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions)) (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions))
return 1; return 1;
@@ -9577,7 +9577,7 @@ static BOOL MountFavoriteVolumeBase (HWND hwnd, const FavoriteVolume &favorite,
else else
mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5; mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
mountOptions.ProtectedHidVolPim = CmdVolumePim; mountOptions.ProtectedHidVolPim = CmdVolumePim;
if (Silent || (DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwnd, (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions) == IDCANCEL)) if (Silent || (SecureDesktopDialogBoxParam (hInst, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwnd, (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions) == IDCANCEL))
{ {
status = FALSE; status = FALSE;
goto skipMount; goto skipMount;
@@ -11394,7 +11394,7 @@ void MountSelectedVolume (HWND hwndDlg, BOOL mountWithOptions)
else else
mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5; mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
mountOptions.ProtectedHidVolPim = CmdVolumePim; mountOptions.ProtectedHidVolPim = CmdVolumePim;
if (IDCANCEL == DialogBoxParamW (hInst, if (IDCANCEL == SecureDesktopDialogBoxParam (hInst,
MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwndDlg, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwndDlg,
(DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions)) (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions))
return; return;