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

Windows: use the correct parent window when changing the password of the encrypted system partition.

Browse Source
This commit is contained in:
Mounir IDRASSI 2014-12-27 12:27:45 +01:00
parent f4c864e88e
commit e18f3cf381
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Common/BootEncryption.cpp
View File

@ -2117,7 +2117,7 @@ namespace VeraCrypt
}
int BootEncryption::ChangePassword (Password *oldPassword, int old_pkcs5,Password *newPassword, int pkcs5, int wipePassCount)
int BootEncryption::ChangePassword (Password *oldPassword, int old_pkcs5,Password *newPassword, int pkcs5, int wipePassCount, HWND hwndDlg)
{
BootEncryptionStatus encStatus = GetStatus();
@ -2164,7 +2164,7 @@ namespace VeraCrypt
if (status != 0)
{
handleError (ParentWindow, status);
handleError (hwndDlg, status);
return status;
}
@ -2182,7 +2182,7 @@ namespace VeraCrypt
SetRandomPoolEnrichedByUserStatus (FALSE);
NormalCursor();
UserEnrichRandomPool (ParentWindow);
UserEnrichRandomPool (hwndDlg);
WaitCursor();
/* The header will be re-encrypted wipePassCount times to prevent adversaries from using
@ -2209,7 +2209,7 @@ namespace VeraCrypt
{
PCRYPTO_INFO tmpCryptoInfo = NULL;
status = CreateVolumeHeaderInMemory (ParentWindow, !encStatus.HiddenSystem,
status = CreateVolumeHeaderInMemory (hwndDlg, !encStatus.HiddenSystem,
header,
cryptoInfo->ea,
cryptoInfo->mode,
@ -2231,7 +2231,7 @@ namespace VeraCrypt
if (status != 0)
{
handleError (ParentWindow, status);
handleError (hwndDlg, status);
return status;
}
@ -2249,7 +2249,7 @@ namespace VeraCrypt
}
catch (Exception &e)
{
e.Show (ParentWindow);
e.Show (hwndDlg);
result = ERR_OS_ERROR;
}

2
src/Common/BootEncryption.h
View File

@ -141,7 +141,7 @@ namespace VeraCrypt
void AbortSetup ();
void AbortSetupWait ();
void CallDriver (DWORD ioctl, void *input = nullptr, DWORD inputSize = 0, void *output = nullptr, DWORD outputSize = 0);
int ChangePassword (Password *oldPassword, int old_pkcs5, Password *newPassword, int pkcs5, int wipePassCount);
int ChangePassword (Password *oldPassword, int old_pkcs5, Password *newPassword, int pkcs5, int wipePassCount, HWND hwndDlg);
void CheckDecoyOSWipeResult ();
void CheckEncryptionSetupResult ();
void CheckRequirements ();

2
src/Mount/Mount.c
View File

@ -1470,7 +1470,7 @@ void CALLBACK ChangePwdWaitThreadProc(void* pArg, HWND hwndDlg)
try
{
*pThreadParam->pnStatus = BootEncObj->ChangePassword (pThreadParam->oldPassword, pThreadParam->old_pkcs5, pThreadParam->newPassword, pThreadParam->pkcs5, pThreadParam->wipePassCount);
*pThreadParam->pnStatus = BootEncObj->ChangePassword (pThreadParam->oldPassword, pThreadParam->old_pkcs5, pThreadParam->newPassword, pThreadParam->pkcs5, pThreadParam->wipePassCount, hwndDlg);
}
catch (Exception &e)
{