diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-02 19:35:12 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-02 19:36:53 +0200 |
commit | d1b26d4bfefe4d7f8581d4555e6634c3603772ed (patch) | |
tree | b71140fbd82edd05e1696902069d2779d14c9d11 /src/Mount/Mount.c | |
parent | a0f2ffb90bf004b08fc4d3e317718d5a78fb54d5 (diff) | |
download | VeraCrypt-d1b26d4bfefe4d7f8581d4555e6634c3603772ed.tar.gz VeraCrypt-d1b26d4bfefe4d7f8581d4555e6634c3603772ed.zip |
Windows: fix documentation and UI messages about the PIM constraints and calculation formula when EFI system encryption is using SHA-512 or Whirlpool. For historical reasons, if SHA-512 or Whirlpool is selected for EFI system encryption, then iterations = 15000 + (PIM x 1000) and not iterations = PIM x 2048 like the other algorithms.
Diffstat (limited to 'src/Mount/Mount.c')
-rw-r--r-- | src/Mount/Mount.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index b0439ea5..6a4a57a7 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -2672,7 +2672,19 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR else if (!(newKeyFilesParam.EnableKeyFiles && newKeyFilesParam.FirstKeyFile != NULL) && pwdChangeDlgMode == PCDM_CHANGE_PASSWORD) { - if (!CheckPasswordLength (hwndDlg, GetWindowTextLength(GetDlgItem (hwndDlg, IDC_PASSWORD)), pim, bSysEncPwdChangeDlgMode, FALSE, FALSE)) + int bootPRF = 0; + if (bSysEncPwdChangeDlgMode) + { + try + { + VOLUME_PROPERTIES_STRUCT properties; + BootEncObj->GetVolumeProperties(&properties); + bootPRF = properties.pkcs5; + } + catch(...) + {} + } + if (!CheckPasswordLength (hwndDlg, GetWindowTextLength(GetDlgItem (hwndDlg, IDC_PASSWORD)), pim, bSysEncPwdChangeDlgMode, bootPRF, FALSE, FALSE)) return 1; } |