If the selected new KDF differs from the current KDF and the volume currently uses a custom PIM, VeraCrypt does not automatically reuse the current PIM. Unless you select Use PIM in the New section and enter a custom value, the rewritten volume header will use the default PIM for the selected KDF.
This function allows you to re-encrypt a volume header with a header key derived using a different PRF function (for example, instead of HMAC-BLAKE2S-256 you could use HMAC-Whirlpool). Note that the volume header contains the master encryption key with which
@@ -77,6 +78,8 @@
diff --git a/doc/html/en/Release Notes.html b/doc/html/en/Release Notes.html
index b72b6f8cab..544165a370 100644
--- a/doc/html/en/Release Notes.html
+++ b/doc/html/en/Release Notes.html
@@ -39,17 +39,24 @@ Release Notes
To avoid hinting whether your volumes contain a hidden volume or not, or if you depend on plausible deniability when using hidden volumes/OS, then you must recreate both the outer and hidden volumes including system encryption and hidden OS, discarding existing volumes created prior to 1.18a version of VeraCrypt.
+
+Warning to users who created hidden volumes inside file containers using VeraCrypt 1.26.6 through 1.26.28:
+A security issue fixed in VeraCrypt 1.26.29 may affect the plausible deniability of these hidden volumes. If you rely on plausible deniability, you should recreate the affected outer file container and its hidden volume using VeraCrypt 1.26.29 or later, then securely erase the old container.
+
+
1.26.29 (June 9th, 2026):
- All OSes:
- Add Argon2id as an alternative memory-hard KDF for non-system volumes.
- Use "KDF" terminology in the user interface and documentation instead of "PKCS-5 PRF".
+ - When changing a volume password or changing only a volume header KDF, use the selected KDF's default PIM when a different KDF is selected unless a new PIM is explicitly specified.
- Update logo icons with simplified icons without extra label text.
- Harden XML and TLV parsers against malformed input.
- Security: Fix GHSA-94c6-mgmv-mqc5: non-default
WOLFCRYPT=1 builds now use wolfCrypt PBKDF2 instead of HKDF and honor VeraCrypt's PBKDF2 iteration count.
- Reported by https://github.com/vastblast
+ - CVE-2026-53762
- Fix CPU feature detection and crypto implementation edge cases, including AVX2/leaf 7 detection, BLAKE2s/Argon2 no-SSE2 x86 fallback paths, Camellia SSSE3 dispatch, Twofish x64 multiblock tail handling and Whirlpool alignment.
@@ -65,6 +72,7 @@ Release Notes
- Reported by https://github.com/vastblast
- Regression introduced in 1.26.6
+ - CVE-2026-54073
- Harden Windows driver input validation and crash dump filter handling (GH PR #1590).
@@ -78,7 +86,7 @@ Release Notes
- Fix EFI
DcsProp rewrite handling.
- Fix ghost drive letter after command line unmount (GH #337, GH #1426).
- Fix favorite volume mount race.
-- Validate PIM when changing only the KDF.
+- Update stored favorite volume PIM/KDF metadata after password or header KDF changes.
- Fix elevated COM format drive validation and device path normalization (GH #1670).
- Fix ReFS formatting during volume creation.
- Fix MSI traveler disk creation with WHQL-signed drivers, ARM64 MSI build, Start Menu folder upgrades, and discovery of newer SDK MSI tools.
diff --git a/doc/html/ru/Release Notes.html b/doc/html/ru/Release Notes.html
index d77ec7c730..ac0a3e57d1 100644
--- a/doc/html/ru/Release Notes.html
+++ b/doc/html/ru/Release Notes.html
@@ -42,6 +42,11 @@ История версий
VeraCrypt старее, чем 1.18a.
+
+Предупреждение для пользователей, создавших скрытые тома внутри файловых контейнеров с помощью VeraCrypt версий от 1.26.6 до 1.26.28 включительно:
+Проблема безопасности, исправленная в VeraCrypt 1.26.29, может повлиять на правдоподобное отрицание наличия шифрования для этих скрытых томов. Если вам необходимо правдоподобно отрицать наличие шифрования, следует создать заново затронутый внешний файловый контейнер и содержащийся в нём скрытый том с помощью VeraCrypt 1.26.29 или более новой версии, а затем безопасно удалить старый контейнер.
+
+
1.26.29 (9 июня 2026 года):
- Все ОС:
@@ -53,6 +58,7 @@
История версий
- Безопасность: исправлена GHSA-94c6-mgmv-mqc5: сборки с неиспользуемым по умолчанию параметром
WOLFCRYPT=1 теперь используют PBKDF2 из wolfCrypt вместо HKDF и учитывают заданное в VeraCrypt число итераций PBKDF2.
- Сообщил https://github.com/vastblast
+ - CVE-2026-53762
- Исправлены определение возможностей процессора и граничные случаи криптографических реализаций, включая определение AVX2/leaf 7, резервные пути BLAKE2s/Argon2 для x86 без SSE2, диспетчеризацию Camellia SSSE3, обработку хвоста многоблочных операций Twofish x64 и выравнивание Whirlpool.
@@ -68,6 +74,7 @@ История версий
- Сообщил https://github.com/vastblast
- Регрессия появилась в версии 1.26.6
+ - CVE-2026-54073
- Усилены проверка входных данных драйвера Windows и обработка фильтра аварийных дампов (GH PR #1590).
diff --git a/doc/html/zh-cn/Release Notes.html b/doc/html/zh-cn/Release Notes.html
index 62e0f195bc..9a7b1afde5 100644
--- a/doc/html/zh-cn/Release Notes.html
+++ b/doc/html/zh-cn/Release Notes.html
@@ -39,6 +39,11 @@ 发行说明
为避免暴露您的卷是否包含隐藏卷，或者如果您在使用隐藏卷/操作系统时依赖似是而非的否认能力，那么您必须重新创建外部和隐藏卷，包括系统加密和隐藏操作系统，并丢弃VeraCrypt 1.18a版本之前创建的现有卷。
+
+给使用 VeraCrypt 1.26.6 至 1.26.28 在文件容器内创建隐藏卷的用户的警告：
+VeraCrypt 1.26.29 修复的一个安全问题可能会影响这些隐藏卷的似是而非的否认性。如果您依赖似是而非的否认性，应使用 VeraCrypt 1.26.29 或更高版本重新创建受影响的外部文件容器及其中的隐藏卷，然后安全擦除旧容器。
+
+
1.26.29 (2026年6月9日):
- 所有操作系统:
@@ -50,6 +55,7 @@
发行说明
- 安全：修复 GHSA-94c6-mgmv-mqc5：非默认启用的
WOLFCRYPT=1 构建现在使用 wolfCrypt PBKDF2 而非 HKDF，并使用 VeraCrypt 的 PBKDF2 迭代次数。
- 由 https://github.com/vastblast 报告
+ - CVE-2026-53762
- 修复 CPU 特性检测和加密实现中的边界情况，包括 AVX2/leaf 7 检测、x86 无 SSE2 构建中的 BLAKE2s/Argon2 后备路径、Camellia SSSE3 调度、Twofish x64 多块尾部处理以及 Whirlpool 对齐。
@@ -64,7 +70,8 @@ 发行说明
- 安全：修复 GHSA-jjcr-75w7-58jp：隐藏卷快速格式化不再使用文件容器快速分配方法；该方法曾每隔 128 MiB 写入明文零扇区。此修复保持似是而非的否认性。
- 由 https://github.com/vastblast 报告
- - 此回归问题引入于 1.26.6
+ - 此回归问题引入于 1.26.6
.
+ - CVE-2026-54073
- 增强 Windows 驱动程序输入验证和崩溃转储过滤处理（GH PR #1590）。
diff --git a/src/Build/Tools/source_date_epoch.sh b/src/Build/Tools/source_date_epoch.sh
index f9d1495653..9e25aa1a26 100755
--- a/src/Build/Tools/source_date_epoch.sh
+++ b/src/Build/Tools/source_date_epoch.sh
@@ -59,12 +59,6 @@ fi
RELEASE_EPOCH=$(awk '
function leap(y) { return ((y % 4 == 0 && y % 100 != 0) || (y % 400 == 0)) }
- function month_number(name) {
- return (name == "January" ? 1 : name == "February" ? 2 : name == "March" ? 3 :
- name == "April" ? 4 : name == "May" ? 5 : name == "June" ? 6 :
- name == "July" ? 7 : name == "August" ? 8 : name == "September" ? 9 :
- name == "October" ? 10 : name == "November" ? 11 : name == "December" ? 12 : 0);
- }
function mdays(m, y) { return (m == 2 ? 28 + leap(y) : (m == 4 || m == 6 || m == 9 || m == 11 ? 30 : 31)) }
function epoch(y, m, d, days, i) {
days = 0;
@@ -75,17 +69,6 @@ RELEASE_EPOCH=$(awk '
}
function is_number(value) { return (value ~ /^[0-9]+$/) }
- /^[[:space:]]*#define[[:space:]]+TC_STR_RELEASE_DATE[[:space:]]+L"/ {
- date = $0;
- sub(/^.*L"/, "", date);
- sub(/".*$/, "", date);
- split(date, parts, /[ ,]+/);
- if (month_number(parts[1]) == 0 || !is_number(parts[2]) || !is_number(parts[3])) exit 1;
- date_month = month_number(parts[1]);
- date_day = parts[2] + 0;
- date_year = parts[3] + 0;
- seen_date = 1;
- }
/^[[:space:]]*#define[[:space:]]+TC_RELEASE_DATE_YEAR[[:space:]]+/ {
if (!is_number($3)) exit 1;
year = $3 + 0;
@@ -102,9 +85,8 @@ RELEASE_EPOCH=$(awk '
seen_day = 1;
}
END {
- if (!seen_date || !seen_year || !seen_month || !seen_day) exit 1;
+ if (!seen_year || !seen_month || !seen_day) exit 1;
if (year < 1970 || month < 1 || month > 12 || day < 1 || day > mdays(month, year)) exit 1;
- if (date_month != month || date_day != day || date_year != year) exit 1;
printf "%d", epoch(year, month, day);
}' "$TCDEFS_H") || {
echo "Error: unable to derive SOURCE_DATE_EPOCH from $TCDEFS_H" >&2
diff --git a/src/Common/Language.xml b/src/Common/Language.xml
index 2d30c76e00..9fcf09f8da 100644
--- a/src/Common/Language.xml
+++ b/src/Common/Language.xml
@@ -610,7 +610,6 @@
Add/Remove Keyfiles to/from Volume
Remove All Keyfiles from Volume
Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.
- This volume is registered as a System Favorite and its PIM was changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.
IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?
Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?
Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).
@@ -1684,6 +1683,8 @@
The selected APFS physical store '{0}' contains the currently mounted macOS system volume and cannot be used as a VeraCrypt volume host.
macOS reports the selected device '{0}' as read-only. Select a writable physical partition or disk.
macOS reported the selected device as read-only. If this is an APFS disk, make sure you selected the physical APFS store partition, not an APFS synthesized volume. Use Disk Utility or 'diskutil list' to identify the physical partition, then retry.
+ This volume is registered as a System Favorite and its PIM and/or KDF settings were changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.
+ The selected KDF uses different PIM parameters, so VeraCrypt will not reuse the current custom PIM. The new volume header will use the default PIM for the selected KDF unless you select "Use PIM" in the New section and enter a custom value.\n\nDo you want to continue?
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index 3c19ec39ac..9f56795fbf 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -73,7 +73,6 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define VERSION_NUM 0x0126
// Release date
-#define TC_STR_RELEASE_DATE L"June 8, 2026"
#define TC_RELEASE_DATE_YEAR 2026
#define TC_RELEASE_DATE_MONTH 6
#define TC_RELEASE_DATE_DAY 9
@@ -406,7 +405,26 @@ void EraseMemory (void *memory, int size);
#define TC_MAX_PATH 260 /* Includes the null terminator */
#endif
-#define TC_STR_RELEASED_BY L"Released by AM Crypto on " TC_STR_RELEASE_DATE
+#define TC_RELEASE_DATE_MONTH_NAME_1 L"January"
+#define TC_RELEASE_DATE_MONTH_NAME_2 L"February"
+#define TC_RELEASE_DATE_MONTH_NAME_3 L"March"
+#define TC_RELEASE_DATE_MONTH_NAME_4 L"April"
+#define TC_RELEASE_DATE_MONTH_NAME_5 L"May"
+#define TC_RELEASE_DATE_MONTH_NAME_6 L"June"
+#define TC_RELEASE_DATE_MONTH_NAME_7 L"July"
+#define TC_RELEASE_DATE_MONTH_NAME_8 L"August"
+#define TC_RELEASE_DATE_MONTH_NAME_9 L"September"
+#define TC_RELEASE_DATE_MONTH_NAME_10 L"October"
+#define TC_RELEASE_DATE_MONTH_NAME_11 L"November"
+#define TC_RELEASE_DATE_MONTH_NAME_12 L"December"
+#define TC_RELEASE_DATE_MONTH_NAME_(m) TC_RELEASE_DATE_MONTH_NAME_##m
+#define TC_RELEASE_DATE_MONTH_NAME(m) TC_RELEASE_DATE_MONTH_NAME_(m)
+
+#define TC_RELEASE_DATE_WSTR2(x) L##x
+#define TC_RELEASE_DATE_WSTR1(x) TC_RELEASE_DATE_WSTR2(#x)
+#define TC_RELEASE_DATE_WSTR(x) TC_RELEASE_DATE_WSTR1(x)
+
+#define TC_STR_RELEASED_BY L"Released by AM Crypto on " TC_RELEASE_DATE_MONTH_NAME(TC_RELEASE_DATE_MONTH) L" " TC_RELEASE_DATE_WSTR(TC_RELEASE_DATE_DAY) L", " TC_RELEASE_DATE_WSTR(TC_RELEASE_DATE_YEAR)
#define MAX_URL_LENGTH 2084 /* Internet Explorer limit. Includes the terminating null character. */
diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp
index 00c3fdb3ec..e6baad3efd 100644
--- a/src/Main/Forms/ChangePasswordDialog.cpp
+++ b/src/Main/Forms/ChangePasswordDialog.cpp
@@ -40,19 +40,33 @@ namespace VeraCrypt
return true;
}
- static bool CheckCustomPimForKdfOnlyChange (VolumePasswordPanel *pimPanel, const shared_ptr &password, const shared_ptr &kdf, int currentPim)
+ static bool CheckCustomPimForKdfOnlyChange (VolumePasswordPanel *pimPanel, const shared_ptr &password, const shared_ptr &kdf, int pim)
{
int defaultPim = kdf ? kdf->GetDefaultPim() : 0;
- if (!kdf || !password || password->Size() == 0 || currentPim <= 0 || defaultPim <= 0 || currentPim == defaultPim)
+ if (!kdf || !password || password->Size() == 0 || pim <= 0 || defaultPim <= 0 || pim == defaultPim)
return true;
- if (currentPim < defaultPim)
- return CheckCustomPimForPassword (pimPanel, password, currentPim, kdf);
+ if (pim < defaultPim)
+ return CheckCustomPimForPassword (pimPanel, password, pim, kdf);
Gui->ShowWarning (kdf->GetPimLargeWarningMessageId());
return true;
}
+ static bool KdfSelectionsEqual (const shared_ptr &left, const shared_ptr &right)
+ {
+ if (!left && !right)
+ return true;
+ if (!left || !right)
+ return false;
+ return left->GetName() == right->GetName();
+ }
+
+ static bool NewKdfSelectionChangesKdf (const shared_ptr ¤tKdf, const shared_ptr &newKdf)
+ {
+ return newKdf && (!currentKdf || !KdfSelectionsEqual (currentKdf, newKdf));
+ }
+
static bool CheckPasswordChangeWarnings (VolumePasswordPanel *passwordPanel, const shared_ptr &password, int pim, const shared_ptr &kdf)
{
if (!password || password->Size() == 0)
@@ -89,7 +103,7 @@ namespace VeraCrypt
#endif
ChangePasswordDialog::ChangePasswordDialog (wxWindow* parent, shared_ptr volumePath, Mode::Enum mode, shared_ptr password, shared_ptr keyfiles, shared_ptr newPassword, shared_ptr newKeyfiles)
- : ChangePasswordDialogBase (parent), DialogMode (mode), Path (volumePath)
+ : ChangePasswordDialogBase (parent), DialogMode (mode), KdfOnlyKdfSelectionInitialized (false), Path (volumePath)
{
bool enableNewPassword = false;
bool enableNewKeyfiles = false;
@@ -134,6 +148,9 @@ namespace VeraCrypt
NewPasswordPanel->UpdateEvent.Connect (EventConnector (this, &ChangePasswordDialog::OnPasswordPanelUpdate));
NewPasswordPanelSizer->Add (NewPasswordPanel, 1, wxALL | wxEXPAND);
+ if (mode == Mode::ChangePkcs5Prf)
+ NewPasswordPanel->EnableUsePim (true);
+
if (mode == Mode::RemoveAllKeyfiles)
NewSizer->Show (false);
@@ -175,6 +192,7 @@ namespace VeraCrypt
shared_ptr newPassword;
int newPim = 0;
+ bool newPimSpecified = false;
if (DialogMode == Mode::ChangePasswordAndKeyfiles)
{
try
@@ -197,13 +215,37 @@ namespace VeraCrypt
else
{
newPassword = currentPassword;
- newPim = CurrentPasswordPanel->GetVolumePim();
- }
+ if (DialogMode == Mode::ChangePkcs5Prf)
+ {
+ bool kdfChangesKdf = NewKdfSelectionChangesKdf (currentKdf, newKdf);
+ newPimSpecified = NewPasswordPanel->IsVolumePimSpecified();
+ if (newPimSpecified)
+ {
+ newPim = NewPasswordPanel->GetVolumePim();
+ if (-1 == newPim)
+ {
+ NewPasswordPanel->SetFocusToPimTextCtrl();
+ return;
+ }
+ }
+ else
+ {
+ newPim = kdfChangesKdf ? 0 : currentPim;
+ }
- if (DialogMode == Mode::ChangePkcs5Prf)
- {
- if (!CheckCustomPimForKdfOnlyChange (CurrentPasswordPanel, newPassword, newKdf, currentPim))
- return;
+ if (kdfChangesKdf && !newPimSpecified && currentPim > 0)
+ {
+ if (!Gui->AskYesNo (LangString["PIM_RESET_ON_KDF_CHANGE_CONFIRM"], false, true))
+ {
+ NewPasswordPanel->SetFocusToPimCheckBox();
+ return;
+ }
+ }
+ }
+ else
+ {
+ newPim = currentPim;
+ }
}
shared_ptr newKeyfiles;
@@ -216,7 +258,7 @@ namespace VeraCrypt
shared_ptr openVolume;
bool masterKeyVulnerable = false;
// If the unchanged KDF is not known yet, open the header before applying KDF-specific PIM limits.
- bool needOpenVolumeForKdf = DialogMode == Mode::ChangePasswordAndKeyfiles
+ bool needOpenVolumeForKdf = (DialogMode == Mode::ChangePasswordAndKeyfiles || DialogMode == Mode::ChangePkcs5Prf)
&& !effectiveNewKdf
&& newPassword->Size() > 0
&& newPim > 0;
@@ -228,6 +270,12 @@ namespace VeraCrypt
{
return;
}
+ else if (DialogMode == Mode::ChangePkcs5Prf
+ && newPimSpecified
+ && !CheckCustomPimForKdfOnlyChange (NewPasswordPanel, newPassword, effectiveNewKdf, newPim))
+ {
+ return;
+ }
/* force the display of the random enriching interface */
RandomNumberGenerator::SetEnrichedByUserStatus (false);
@@ -265,11 +313,18 @@ namespace VeraCrypt
if (needOpenVolumeForKdf)
{
- if (!CheckPasswordChangeWarnings (NewPasswordPanel, newPassword, newPim, effectiveNewKdf))
+ if (DialogMode == Mode::ChangePasswordAndKeyfiles
+ && !CheckPasswordChangeWarnings (NewPasswordPanel, newPassword, newPim, effectiveNewKdf))
{
// The volume was opened only to detect its KDF; no header rewrite has started.
return;
}
+ else if (DialogMode == Mode::ChangePkcs5Prf
+ && newPimSpecified
+ && !CheckCustomPimForKdfOnlyChange (NewPasswordPanel, newPassword, effectiveNewKdf, newPim))
+ {
+ return;
+ }
/* force the display of the random enriching interface */
RandomNumberGenerator::SetEnrichedByUserStatus (false);
@@ -350,6 +405,30 @@ namespace VeraCrypt
if (CurrentPasswordPanel->GetVolumePim () == -1)
ok = false;
+ if (DialogMode == Mode::ChangePkcs5Prf)
+ {
+ shared_ptr currentKdf = CurrentPasswordPanel->GetPkcs5Kdf();
+ shared_ptr newKdf = NewPasswordPanel->GetPkcs5Kdf();
+
+ if (!KdfOnlyKdfSelectionInitialized)
+ {
+ LastCurrentKdf = currentKdf;
+ LastNewKdf = newKdf;
+ KdfOnlyKdfSelectionInitialized = true;
+ }
+ else if (!KdfSelectionsEqual (LastCurrentKdf, currentKdf) || !KdfSelectionsEqual (LastNewKdf, newKdf))
+ {
+ LastCurrentKdf = currentKdf;
+ LastNewKdf = newKdf;
+
+ if (!NewPasswordPanel->IsVolumePimSpecified() && NewKdfSelectionChangesKdf (currentKdf, newKdf))
+ NewPasswordPanel->ResetVolumePimToDefault();
+ }
+
+ if (NewPasswordPanel->GetVolumePim () == -1)
+ ok = false;
+ }
+
if (DialogMode == Mode::RemoveAllKeyfiles && (passwordEmpty || keyfilesEmpty))
ok = false;
@@ -377,7 +456,7 @@ namespace VeraCrypt
OKButton->Enable (ok);
- if (DialogMode == Mode::ChangePasswordAndKeyfiles)
+ if (DialogMode == Mode::ChangePasswordAndKeyfiles || DialogMode == Mode::ChangePkcs5Prf)
{
bool pimChanged = (CurrentPasswordPanel->GetVolumePim() != NewPasswordPanel->GetVolumePim());
NewPasswordPanel->UpdatePimHelpText(pimChanged);
diff --git a/src/Main/Forms/ChangePasswordDialog.h b/src/Main/Forms/ChangePasswordDialog.h
index 6e6aa6b49c..a04346f83b 100644
--- a/src/Main/Forms/ChangePasswordDialog.h
+++ b/src/Main/Forms/ChangePasswordDialog.h
@@ -46,6 +46,9 @@ namespace VeraCrypt
void OnPasswordPanelUpdate (EventArgs &args) { OnPasswordPanelUpdate(); }
Mode::Enum DialogMode;
+ bool KdfOnlyKdfSelectionInitialized;
+ shared_ptr LastCurrentKdf;
+ shared_ptr LastNewKdf;
VolumePasswordPanel *CurrentPasswordPanel;
VolumePasswordPanel *NewPasswordPanel;
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
index a1cc5bc62c..2659de7af0 100644
--- a/src/Main/Forms/VolumePasswordPanel.cpp
+++ b/src/Main/Forms/VolumePasswordPanel.cpp
@@ -153,10 +153,13 @@ namespace VeraCrypt
Layout();
Fit();
+
+ Pkcs5PrfChoice->Connect (wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (VolumePasswordPanel::OnPkcs5PrfChoiceSelected), nullptr, this);
}
VolumePasswordPanel::~VolumePasswordPanel ()
{
+ Pkcs5PrfChoice->Disconnect (wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (VolumePasswordPanel::OnPkcs5PrfChoiceSelected), nullptr, this);
WipeTextCtrl (PasswordTextCtrl);
WipeTextCtrl (ConfirmPasswordTextCtrl);
}
@@ -281,6 +284,40 @@ namespace VeraCrypt
}
}
+ void VolumePasswordPanel::EnableUsePim (bool pimOnlyDisplay)
+ {
+ EnablePimEntry = true;
+ PimCheckBox->Enable (true);
+ PimCheckBox->Show (true);
+ if (pimOnlyDisplay)
+ DisplayPasswordCheckBox->SetLabel (LangString["IDC_SHOW_PIM"]);
+ DisplayPasswordCheckBox->Show (true);
+ Layout();
+ Fit();
+ GetParent()->Layout();
+ GetParent()->Fit();
+ }
+
+ void VolumePasswordPanel::ResetVolumePimToDefault ()
+ {
+ if (DisplayPasswordCheckBox->IsChecked() && VolumePimTextCtrl->IsShown())
+ DisplayPassword (false, &VolumePimTextCtrl, 3);
+
+ DisplayPasswordCheckBox->SetValue (false);
+ SetVolumePim (0);
+ PimCheckBox->SetValue (false);
+ PimCheckBox->Show (EnablePimEntry);
+ VolumePimStaticText->Show (false);
+ VolumePimTextCtrl->Show (false);
+ VolumePimHelpStaticText->SetForegroundColour (wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOWTEXT));
+ VolumePimHelpStaticText->SetLabel (LangString["IDC_PIM_HELP"]);
+ VolumePimHelpStaticText->Show (false);
+ Layout();
+ Fit();
+ GetParent()->Layout();
+ GetParent()->Fit();
+ }
+
int VolumePasswordPanel::GetHeaderWipeCount () const
{
try
@@ -366,7 +403,8 @@ namespace VeraCrypt
void VolumePasswordPanel::OnDisplayPasswordCheckBoxClick (wxCommandEvent& event)
{
- DisplayPassword (event.IsChecked(), &PasswordTextCtrl, 1);
+ if (PasswordTextCtrl->IsShown())
+ DisplayPassword (event.IsChecked(), &PasswordTextCtrl, 1);
if (ConfirmPasswordTextCtrl->IsShown())
DisplayPassword (event.IsChecked(), &ConfirmPasswordTextCtrl, 2);
@@ -477,6 +515,7 @@ namespace VeraCrypt
layoutParent->Layout();
layoutParent->Fit();
+ OnUpdate();
}
}
}
diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h
index 933ece2e42..48de7df95c 100644
--- a/src/Main/Forms/VolumePasswordPanel.h
+++ b/src/Main/Forms/VolumePasswordPanel.h
@@ -31,12 +31,15 @@ namespace VeraCrypt
shared_ptr GetPkcs5Kdf () const;
int GetVolumePim () const;
int GetHeaderWipeCount () const;
+ bool IsVolumePimSpecified () const { return VolumePimTextCtrl->IsEnabled () && VolumePimTextCtrl->IsShown (); }
void SetCacheCheckBoxValidator (const wxGenericValidator &validator) { CacheCheckBox->SetValidator (validator); }
void SetFocusToPasswordTextCtrl () { PasswordTextCtrl->SetSelection (-1, -1); PasswordTextCtrl->SetFocus(); }
+ void SetFocusToPimCheckBox () { PimCheckBox->SetFocus(); }
void SetFocusToPimTextCtrl () { VolumePimTextCtrl->SetSelection (-1, -1); VolumePimTextCtrl->SetFocus(); }
+ void ResetVolumePimToDefault ();
void SetVolumePim (int pim);
bool PasswordsMatch () const;
- void EnableUsePim () { PimCheckBox->Enable (true); PimCheckBox->Show (true); }
+ void EnableUsePim (bool pimOnlyDisplay = false);
bool IsUsePimChecked () const { return PimCheckBox->GetValue (); }
void SetUsePimChecked (bool checked) const { PimCheckBox->SetValue (checked); }
bool UpdatePimHelpText (bool pimChanged);
@@ -55,6 +58,7 @@ namespace VeraCrypt
void OnKeyfilesButtonClick (wxCommandEvent& event);
void OnKeyfilesButtonRightClick (wxMouseEvent& event);
void OnKeyfilesButtonRightDown (wxMouseEvent& event);
+ void OnPkcs5PrfChoiceSelected (wxCommandEvent& event) { OnUpdate(); }
void OnTextChanged (wxCommandEvent& event) { OnUpdate(); }
void OnPimChanged (wxCommandEvent& event) { OnUpdate(); }
void OnUsePimCheckBoxClick( wxCommandEvent& event );
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 0fcd487626..0ca79ddb2e 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -2538,6 +2538,74 @@ static BOOL CheckKdfOnlyPimForPassword (HWND hwndDlg, const Password *password,
return CheckPasswordLength (hwndDlg, password->Length, pim, FALSE, pimValidationPkcs5, TRUE, FALSE);
}
+static int GetSelectedKdfId (HWND hwndDlg, UINT ctrlId)
+{
+ HWND hComboBox = GetDlgItem (hwndDlg, ctrlId);
+ LRESULT selectedIndex = SendMessage (hComboBox, CB_GETCURSEL, 0, 0);
+ LRESULT itemData;
+
+ if (selectedIndex == CB_ERR)
+ return 0;
+
+ itemData = SendMessage (hComboBox, CB_GETITEMDATA, selectedIndex, 0);
+ if (itemData == CB_ERR)
+ return 0;
+
+ return (int) itemData;
+}
+
+static BOOL NewKdfSelectionChangesKdf (int old_pkcs5, int pkcs5)
+{
+ return (pkcs5 != 0 && (old_pkcs5 == 0 || old_pkcs5 != pkcs5));
+}
+
+static BOOL IsNewPimSpecified (HWND hwndDlg)
+{
+ HWND hPim = GetDlgItem (hwndDlg, IDC_PIM);
+ return IsWindowEnabled (hPim) && IsWindowVisible (hPim);
+}
+
+/* The New PIM field can be shown automatically to mirror the current PIM.
+ * Keep that separate from an explicit user request to write a custom New PIM. */
+static BOOL PasswordChangeNewPimExplicitlySpecified = FALSE;
+static BOOL PasswordChangeNewPimProgrammaticUpdate = FALSE;
+
+static BOOL IsNewPimExplicitlySpecified (HWND hwndDlg)
+{
+ return PasswordChangeNewPimExplicitlySpecified && IsNewPimSpecified (hwndDlg);
+}
+
+static void SetNewPimValueProgrammatically (HWND hwndDlg, int pim)
+{
+ PasswordChangeNewPimProgrammaticUpdate = TRUE;
+ SetPim (hwndDlg, IDC_PIM, pim);
+ PasswordChangeNewPimProgrammaticUpdate = FALSE;
+}
+
+static void SetNewPimTextProgrammatically (HWND hwndDlg, const wchar_t *pimText)
+{
+ PasswordChangeNewPimProgrammaticUpdate = TRUE;
+ SetDlgItemText (hwndDlg, IDC_PIM, pimText);
+ PasswordChangeNewPimProgrammaticUpdate = FALSE;
+}
+
+static void ResetNewPimToDefault (HWND hwndDlg)
+{
+ PasswordChangeNewPimExplicitlySpecified = FALSE;
+ SetNewPimValueProgrammatically (hwndDlg, 0);
+ SetCheckBox (hwndDlg, IDC_NEW_PIM_ENABLE, FALSE);
+ ShowWindow (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE), SW_SHOW);
+ ShowWindow (GetDlgItem (hwndDlg, IDT_PIM), SW_HIDE);
+ ShowWindow (GetDlgItem (hwndDlg, IDC_PIM), SW_HIDE);
+ ShowWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), SW_HIDE);
+}
+
+typedef struct
+{
+ int NewPimValue;
+ int NewPkcs5Value;
+} PasswordChangeDlgResult;
+
// implementation for support of change password operation in wait dialog mechanism
typedef struct
@@ -2653,7 +2721,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
{
static KeyFilesDlgParam newKeyFilesParam;
static BOOL PimValueChangedWarning = FALSE;
- static int* NewPimValuePtr = NULL;
+ static PasswordChangeDlgResult* ResultPtr = NULL;
WORD lw = LOWORD (wParam);
WORD hw = HIWORD (wParam);
@@ -2675,12 +2743,14 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
if (EffectiveVolumePkcs5 == 0)
EffectiveVolumePkcs5 = DefaultVolumePkcs5;
- NewPimValuePtr = (int*) lParam;
+ ResultPtr = (PasswordChangeDlgResult*) lParam;
PimValueChangedWarning = FALSE;
+ PasswordChangeNewPimExplicitlySpecified = FALSE;
+ PasswordChangeNewPimProgrammaticUpdate = FALSE;
ZeroMemory (&newKeyFilesParam, sizeof (newKeyFilesParam));
- if (NewPimValuePtr)
+ if (ResultPtr)
{
/* we are in the case of a volume. Store its name to use it in the key file dialog
* this will help avoid using the current container file as a key file
@@ -2759,12 +2829,13 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
LocalizeDialog (hwndDlg, "IDD_PCDM_CHANGE_PKCS5_PRF");
EnableWindow (GetDlgItem (hwndDlg, IDC_PASSWORD), FALSE);
EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), FALSE);
- EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), FALSE);
- EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), FALSE);
- EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), FALSE);
- EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE), FALSE);
+ EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), TRUE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), TRUE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), TRUE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE), TRUE);
EnableWindow (GetDlgItem (hwndDlg, IDC_ENABLE_NEW_KEYFILES), FALSE);
- EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), FALSE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), TRUE);
+ SetWindowTextW (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), GetString ("IDC_SHOW_PIM"));
EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_KEYFILES), FALSE);
EnableWindow (GetDlgItem (hwndDlg, IDT_NEW_PASSWORD), FALSE);
EnableWindow (GetDlgItem (hwndDlg, IDT_CONFIRM_PASSWORD), FALSE);
@@ -2843,6 +2914,17 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), FALSE);
EnableWindow (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), FALSE);
+ if (pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF)
+ {
+ PasswordChangeNewPimExplicitlySpecified = FALSE;
+ SetNewPimValueProgrammatically (hwndDlg, 0);
+ EnableWindow (GetDlgItem (hwndDlg, IDT_PIM), FALSE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_PIM), FALSE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_PIM_HELP), FALSE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE), FALSE);
+ EnableWindow (GetDlgItem (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW), FALSE);
+ }
+
if (SetTimer (hwndDlg, TIMER_ID_KEYB_LAYOUT_GUARD, TIMER_INTERVAL_KEYB_LAYOUT_GUARD, NULL) == 0)
{
Error ("CANNOT_SET_TIMER", hwndDlg);
@@ -2981,15 +3063,21 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
IDC_PASSWORD, IDC_VERIFY,
newKeyFilesParam.EnableKeyFiles && newKeyFilesParam.FirstKeyFile != NULL);
- if ((lw == IDC_OLD_PIM) && IsWindowEnabled (GetDlgItem (hwndDlg, IDC_PIM)))
+ if ((lw == IDC_OLD_PIM)
+ && pwdChangeDlgMode != PCDM_CHANGE_PKCS5_PRF
+ && IsNewPimSpecified (hwndDlg)
+ && !NewKdfSelectionChangesKdf (GetSelectedKdfId (hwndDlg, IDC_PKCS5_OLD_PRF_ID), GetSelectedKdfId (hwndDlg, IDC_PKCS5_PRF_ID)))
{
wchar_t tmp[MAX_PIM+1] = {0};
GetDlgItemText (hwndDlg, IDC_OLD_PIM, tmp, MAX_PIM + 1);
- SetDlgItemText (hwndDlg, IDC_PIM, tmp);
+ SetNewPimTextProgrammatically (hwndDlg, tmp);
}
if (lw == IDC_PIM)
{
+ if (!PasswordChangeNewPimProgrammaticUpdate && IsNewPimSpecified (hwndDlg))
+ PasswordChangeNewPimExplicitlySpecified = TRUE;
+
if(GetPim (hwndDlg, IDC_OLD_PIM, 0) != GetPim (hwndDlg, IDC_PIM, 0))
{
PimValueChangedWarning = TRUE;
@@ -3012,8 +3100,10 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
ShowWindow (GetDlgItem( hwndDlg, IDC_OLD_PIM), SW_SHOW);
ShowWindow (GetDlgItem( hwndDlg, IDC_OLD_PIM_HELP), SW_SHOW);
- // check also the "Use PIM" for the new password if it is enabled
- if (IsWindowEnabled (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE)))
+ // Preserve the PIM automatically only when the selected KDF is not changing.
+ if (pwdChangeDlgMode != PCDM_CHANGE_PKCS5_PRF
+ && IsWindowEnabled (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE))
+ && !NewKdfSelectionChangesKdf (GetSelectedKdfId (hwndDlg, IDC_PKCS5_OLD_PRF_ID), GetSelectedKdfId (hwndDlg, IDC_PKCS5_PRF_ID)))
{
SetCheckBox (hwndDlg, IDC_NEW_PIM_ENABLE, TRUE);
@@ -3030,6 +3120,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
if (lw == IDC_NEW_PIM_ENABLE)
{
+ PasswordChangeNewPimExplicitlySpecified = TRUE;
ShowWindow (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE), SW_HIDE);
ShowWindow (GetDlgItem( hwndDlg, IDT_PIM), SW_SHOW);
ShowWindow (GetDlgItem( hwndDlg, IDC_PIM), SW_SHOW);
@@ -3128,9 +3219,11 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
if (hw == CBN_SELCHANGE)
{
+ BOOL kdfSelectionChanged = FALSE;
switch (lw)
{
case IDC_PKCS5_PRF_ID:
+ kdfSelectionChanged = TRUE;
if (bSysEncPwdChangeDlgMode)
{
int new_hash_algo_id = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
@@ -3144,6 +3237,22 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
}
}
break;
+
+ case IDC_PKCS5_OLD_PRF_ID:
+ kdfSelectionChanged = TRUE;
+ break;
+ }
+
+ if (kdfSelectionChanged
+ && !bSysEncPwdChangeDlgMode
+ && (pwdChangeDlgMode == PCDM_CHANGE_PASSWORD || pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF)
+ && IsWindowEnabled (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE))
+ && !IsNewPimExplicitlySpecified (hwndDlg)
+ && NewKdfSelectionChangesKdf (GetSelectedKdfId (hwndDlg, IDC_PKCS5_OLD_PRF_ID), GetSelectedKdfId (hwndDlg, IDC_PKCS5_PRF_ID)))
+ {
+ ResetNewPimToDefault (hwndDlg);
+ PimValueChangedWarning = FALSE;
+ SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, (wchar_t *) GetDictionaryValueByInt (IDC_PIM_HELP));
}
return 1;
@@ -3157,7 +3266,8 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
if (lw == IDC_SHOW_PASSWORD_CHPWD_NEW)
{
- HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW, IDC_PASSWORD, IDC_VERIFY);
+ if (pwdChangeDlgMode != PCDM_CHANGE_PKCS5_PRF)
+ HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW, IDC_PASSWORD, IDC_VERIFY);
HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PASSWORD_CHPWD_NEW, IDC_PIM, 0);
return 1;
}
@@ -3173,15 +3283,25 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
SendMessage (GetDlgItem (hwndDlg, IDC_WIPE_MODE), CB_GETCURSEL, 0, 0),
0);
int nStatus;
- int old_pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETITEMDATA,
- SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_OLD_PRF_ID), CB_GETCURSEL, 0, 0), 0);
- int pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA,
- SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0);
+ int old_pkcs5 = GetSelectedKdfId (hwndDlg, IDC_PKCS5_OLD_PRF_ID);
+ int pkcs5 = GetSelectedKdfId (hwndDlg, IDC_PKCS5_PRF_ID);
int old_pim = GetPim (hwndDlg, IDC_OLD_PIM, 0);
int pim = GetPim (hwndDlg, IDC_PIM, 0);
+ BOOL newPimSpecified = IsNewPimExplicitlySpecified (hwndDlg);
+ BOOL newKdfChangesKdf = !bSysEncPwdChangeDlgMode && NewKdfSelectionChangesKdf (old_pkcs5, pkcs5);
+ BOOL newPimSelectable = (pwdChangeDlgMode == PCDM_CHANGE_PASSWORD || pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF);
int iMaxPasswordLength = (bUseLegacyMaxPasswordLength)? MAX_LEGACY_PASSWORD : MAX_PASSWORD;
+ if (pwdChangeDlgMode == PCDM_ADD_REMOVE_VOL_KEYFILES || pwdChangeDlgMode == PCDM_REMOVE_ALL_KEYFILES_FROM_VOL)
+ {
+ pim = old_pim;
+ }
+ else if (newPimSelectable && !newPimSpecified)
+ {
+ pim = newKdfChangesKdf ? 0 : old_pim;
+ }
+
if (bSysEncPwdChangeDlgMode && !CheckPasswordCharEncoding (GetDlgItem (hwndDlg, IDC_PASSWORD), NULL))
{
Error ("UNSUPPORTED_CHARS_IN_PWD", hwndDlg);
@@ -3202,6 +3322,13 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
return 1;
}
+ if (newPimSelectable && newKdfChangesKdf && !newPimSpecified && old_pim > 0
+ && AskWarnNoYes ("PIM_RESET_ON_KDF_CHANGE_CONFIRM", hwndDlg) != IDYES)
+ {
+ SetFocus (GetDlgItem (hwndDlg, IDC_NEW_PIM_ENABLE));
+ return 1;
+ }
+
if (pwdChangeDlgMode == PCDM_CHANGE_PKCS5_PRF)
{
newKeyFilesParam.EnableKeyFiles = KeyFilesEnable;
@@ -3249,12 +3376,16 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
{
case PCDM_REMOVE_ALL_KEYFILES_FROM_VOL:
case PCDM_ADD_REMOVE_VOL_KEYFILES:
- case PCDM_CHANGE_PKCS5_PRF:
memcpy (newPassword.Text, oldPassword.Text, sizeof (newPassword.Text));
newPassword.Length = (unsigned __int32) strlen ((char *) oldPassword.Text);
pim = old_pim;
break;
+ case PCDM_CHANGE_PKCS5_PRF:
+ memcpy (newPassword.Text, oldPassword.Text, sizeof (newPassword.Text));
+ newPassword.Length = (unsigned __int32) strlen ((char *) oldPassword.Text);
+ break;
+
default:
if (GetPassword (hwndDlg, IDC_PASSWORD, (LPSTR) newPassword.Text, iMaxPasswordLength + 1, FALSE, TRUE))
newPassword.Length = (unsigned __int32) strlen ((char *) newPassword.Text);
@@ -3300,13 +3431,14 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
ShowWaitDialog(hwndDlg, TRUE, ChangePwdWaitThreadProc, &changePwdParam);
err:
- // notify the caller in case the PIM has changed
- if (NewPimValuePtr)
+ if (ResultPtr && nStatus == 0)
{
- if (pim != old_pim)
- *NewPimValuePtr = pim;
+ if (newKdfChangesKdf || pim != old_pim)
+ ResultPtr->NewPimValue = pim;
else
- *NewPimValuePtr = -1;
+ ResultPtr->NewPimValue = -1;
+
+ ResultPtr->NewPkcs5Value = newKdfChangesKdf ? pkcs5 : -1;
}
burn (&oldPassword, sizeof (oldPassword));
@@ -6520,10 +6652,71 @@ static BOOL MountAllDevices (HWND hwndDlg, BOOL bPasswordPrompt)
return param.bRet;
}
+static bool FavoritePimOrKdfNeedsUpdate (const FavoriteVolume &favorite, int newPimValue, int newPkcs5Value)
+{
+ return ((newPimValue != -1 && favorite.Pim != newPimValue)
+ || (newPkcs5Value > 0 && favorite.Pkcs5 != newPkcs5Value));
+}
+
+static void UpdateFavoritePimAndKdfValues (FavoriteVolume &favorite, int newPimValue, int newPkcs5Value)
+{
+ if (newPimValue != -1)
+ favorite.Pim = newPimValue;
+
+ if (newPkcs5Value > 0)
+ favorite.Pkcs5 = newPkcs5Value;
+}
+
+static void UpdateFavoritePimAndKdfValues (HWND hwndDlg, const wchar_t *volumePath, int newPimValue, int newPkcs5Value)
+{
+ bool bFavoriteFound = false;
+
+ if (newPimValue == -1 && newPkcs5Value <= 0)
+ return;
+
+ for (vector ::iterator favorite = FavoriteVolumes.begin();
+ favorite != FavoriteVolumes.end(); favorite++)
+ {
+ if (favorite->Path == volumePath)
+ {
+ bFavoriteFound = true;
+ if (FavoritePimOrKdfNeedsUpdate (*favorite, newPimValue, newPkcs5Value))
+ {
+ UpdateFavoritePimAndKdfValues (*favorite, newPimValue, newPkcs5Value);
+ SaveFavoriteVolumes (hwndDlg, FavoriteVolumes, false);
+ }
+ break;
+ }
+ }
+
+ if (!bFavoriteFound)
+ {
+ for (vector ::iterator favorite = SystemFavoriteVolumes.begin();
+ favorite != SystemFavoriteVolumes.end(); favorite++)
+ {
+ if (favorite->Path == volumePath)
+ {
+ bFavoriteFound = true;
+
+ if (FavoritePimOrKdfNeedsUpdate (*favorite, newPimValue, newPkcs5Value)
+ && AskYesNo ("FAVORITE_PIM_OR_KDF_CHANGED", hwndDlg) == IDYES)
+ {
+ UpdateFavoritePimAndKdfValues (*favorite, newPimValue, newPkcs5Value);
+ SaveFavoriteVolumes (hwndDlg, SystemFavoriteVolumes, true);
+ }
+ break;
+ }
+ }
+ }
+}
+
static void ChangePassword (HWND hwndDlg)
{
INT_PTR result;
- int newPimValue = -1;
+ PasswordChangeDlgResult dlgResult;
+
+ dlgResult.NewPimValue = -1;
+ dlgResult.NewPkcs5Value = -1;
GetVolumePath (hwndDlg, szFileName, ARRAYSIZE (szFileName));
@@ -6547,7 +6740,7 @@ static void ChangePassword (HWND hwndDlg)
bSysEncPwdChangeDlgMode = FALSE;
result = DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_PASSWORDCHANGE_DLG), hwndDlg,
- (DLGPROC) PasswordChangeDlgProc, (LPARAM) &newPimValue);
+ (DLGPROC) PasswordChangeDlgProc, (LPARAM) &dlgResult);
if (result == IDOK)
{
@@ -6555,6 +6748,7 @@ static void ChangePassword (HWND hwndDlg)
{
case PCDM_CHANGE_PKCS5_PRF:
Info ("PKCS5_PRF_CHANGED", hwndDlg);
+ UpdateFavoritePimAndKdfValues (hwndDlg, szFileName, dlgResult.NewPimValue, dlgResult.NewPkcs5Value);
break;
case PCDM_ADD_REMOVE_VOL_KEYFILES:
@@ -6566,41 +6760,7 @@ static void ChangePassword (HWND hwndDlg)
default:
{
Info ("PASSWORD_CHANGED", hwndDlg);
- if (newPimValue != -1)
- {
- // update the encoded volue in favorite XML if found
- bool bFavoriteFound = false;
- for (vector ::iterator favorite = FavoriteVolumes.begin();
- favorite != FavoriteVolumes.end(); favorite++)
- {
- if (favorite->Path == szFileName)
- {
- bFavoriteFound = true;
- favorite->Pim = newPimValue;
- SaveFavoriteVolumes (hwndDlg, FavoriteVolumes, false);
- break;
- }
- }
-
- if (!bFavoriteFound)
- {
- for (vector ::iterator favorite = SystemFavoriteVolumes.begin();
- favorite != SystemFavoriteVolumes.end(); favorite++)
- {
- if (favorite->Path == szFileName)
- {
- bFavoriteFound = true;
- favorite->Pim = newPimValue;
-
- if (AskYesNo("FAVORITE_PIM_CHANGED", hwndDlg) == IDYES)
- {
- SaveFavoriteVolumes (hwndDlg, SystemFavoriteVolumes, true);
- }
- break;
- }
- }
- }
- }
+ UpdateFavoritePimAndKdfValues (hwndDlg, szFileName, dlgResult.NewPimValue, dlgResult.NewPkcs5Value);
}
}
}