From d01fa1198337f0f088c2b61484eb6678bb363598 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 26 Jan 2015 10:14:09 +0100 Subject: Linux/MacOSX: use command line values of TrueCryptMode and PRF as defaults for the password dialog --- src/Main/Forms/MainFrame.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/Main/Forms/MainFrame.cpp') diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp index ca4d7d63..08184005 100644 --- a/src/Main/Forms/MainFrame.cpp +++ b/src/Main/Forms/MainFrame.cpp @@ -664,6 +664,11 @@ namespace VeraCrypt MountOptions mountOptions (GetPreferences().DefaultMountOptions); mountOptions.SlotNumber = SelectedSlotNumber; mountOptions.Path = GetSelectedVolumePath(); + mountOptions.TrueCryptMode = CmdLine->ArgTrueCryptMode; + if (CmdLine->ArgHash) + { + mountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash, CmdLine->ArgTrueCryptMode); + } try { @@ -881,6 +886,11 @@ namespace VeraCrypt SetVolumePath (favorite.Path); MountOptions mountOptions (GetPreferences().DefaultMountOptions); + mountOptions.TrueCryptMode = CmdLine->ArgTrueCryptMode; + if (CmdLine->ArgHash) + { + mountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash, CmdLine->ArgTrueCryptMode); + } favorite.ToMountOptions (mountOptions); shared_ptr volume = Gui->MountVolume (mountOptions); -- cgit v1.2.3