mirrors/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-05-14 00:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Validate PIM on KDF-only password changes

Browse Source
This commit is contained in:
Mounir IDRASSI
2026-04-19 17:03:04 +09:00
parent e6adb96b15
commit e07bd19f20
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mount/Mount.c
View File

@@ -2230,6 +2230,23 @@ static void PasswordChangeEnable (HWND hwndDlg, int button, int passwordId, BOOL
EnableWindow (GetDlgItem (hwndDlg, button), bEnable);
}
static BOOL CheckKdfOnlyPimForPassword (HWND hwndDlg, const Password *password, int pim, int old_pkcs5, int pkcs5)
{
int pimValidationPkcs5 = pkcs5;
if (!password || password->Length == 0 || pim <= 0)
return TRUE;
if (pimValidationPkcs5 == 0)
{
pimValidationPkcs5 = old_pkcs5;
if (pimValidationPkcs5 == 0)
return TRUE;
}
return CheckPasswordLength (hwndDlg, password->Length, pim, FALSE, pimValidationPkcs5, TRUE, FALSE);
}
// implementation for support of change password operation in wait dialog mechanism
typedef struct
@@ -2943,6 +2960,17 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
return 1;
}
if (!bSysEncPwdChangeDlgMode
&& pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF
&& !CheckKdfOnlyPimForPassword (hwndDlg, &newPassword, pim, old_pkcs5, pkcs5))
{
burn (&oldPassword, sizeof (oldPassword));
burn (&newPassword, sizeof (newPassword));
burn (&old_pim, sizeof (old_pim));
burn (&pim, sizeof (pim));
return 1;
}
WaitCursor ();
if (KeyFilesEnable)