Unix: isolate auto-mount options and EMV settings

Clone command-line auto-mount options before device and favorite batches, and clone the batch options again for each favorite before applying favorite-specific fields.

This prevents interactive credentials, PIM, KDF choices, and per-favorite filesystem settings from carrying over to later favorites.

Propagate EMVSupportEnabled through MountOptions serialization and mount setup so elevated core service requests use the same EMV setting as the caller.
This commit is contained in:
Mounir IDRASSI committed 2026-07-08 22:51:55 +09:00
1 parent fdf0c8f7ec
commit 9cabe0dc4e
9 files changed
+71 -22

No files matched your search

+3
View File
@@ -55,6 +55,7 @@ namespace VeraCrypt
TC_CLONE (SharedAccessAllowed);
TC_CLONE (SlotNumber);
TC_CLONE (UseBackupHeaders);
TC_CLONE (EMVSupportEnabled);
}
void MountOptions::Deserialize (shared_ptr <Stream> stream)
@@ -105,6 +106,7 @@ namespace VeraCrypt
sr.Deserialize ("SharedAccessAllowed", SharedAccessAllowed);
sr.Deserialize ("SlotNumber", SlotNumber);
sr.Deserialize ("UseBackupHeaders", UseBackupHeaders);
sr.Deserialize ("EMVSupportEnabled", EMVSupportEnabled);
try
{
@@ -172,6 +174,7 @@ namespace VeraCrypt
sr.Serialize ("SharedAccessAllowed", SharedAccessAllowed);
sr.Serialize ("SlotNumber", SlotNumber);
sr.Serialize ("UseBackupHeaders", UseBackupHeaders);
sr.Serialize ("EMVSupportEnabled", EMVSupportEnabled);
sr.Serialize ("KdfNull", Kdf == nullptr);
if (Kdf)
+2 -1
View File
@@ -40,7 +40,8 @@ namespace VeraCrypt
Removable (false),
SharedAccessAllowed (false),
SlotNumber (0),
UseBackupHeaders (false)
UseBackupHeaders (false),
EMVSupportEnabled (false)
{
}