From ba1e9c8f4d6d65a5d5a73f1721bf2b03e42aa50e Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 28 Feb 2015 17:01:39 +0100 Subject: Linux/MacOSX: A configuration option for default hash and default TrueCrypt mode used for mounting volumes (Menu Settings -> Default Mount Parameters). Implement priority of command line arguments over default values. --- src/Main/UserPreferences.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) mode change 100644 => 100755 src/Main/UserPreferences.cpp (limited to 'src/Main/UserPreferences.cpp') diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp old mode 100644 new mode 100755 index b8a4d704..f66d8bef --- a/src/Main/UserPreferences.cpp +++ b/src/Main/UserPreferences.cpp @@ -104,6 +104,24 @@ namespace VeraCrypt TC_CONFIG_SET (UseKeyfiles); TC_CONFIG_SET (WipeCacheOnAutoDismount); TC_CONFIG_SET (WipeCacheOnClose); + + SetValue (configMap[L"DefaultTrueCryptMode"], DefaultMountOptions.TrueCryptMode); + + wstring defaultPrf; + SetValue (configMap[L"DefaultPRF"], defaultPrf); + + shared_ptr savedKdf; + try + { + if (defaultPrf != L"autodetection") + savedKdf = Pkcs5Kdf::GetAlgorithm (defaultPrf, DefaultMountOptions.TrueCryptMode); + } + catch (ParameterIncorrect&) + { + } + + DefaultMountOptions.Kdf = savedKdf; + DefaultMountOptions.ProtectionKdf = savedKdf; } // Default keyfiles @@ -200,6 +218,13 @@ namespace VeraCrypt TC_CONFIG_ADD (UseKeyfiles); TC_CONFIG_ADD (WipeCacheOnAutoDismount); TC_CONFIG_ADD (WipeCacheOnClose); + + formatter.AddEntry (L"DefaultTrueCryptMode", DefaultMountOptions.TrueCryptMode); + + wstring defaultPrf = L"autodetection"; + if (DefaultMountOptions.Kdf) + defaultPrf = DefaultMountOptions.Kdf->GetName (); + formatter.AddEntry (L"DefaultPRF", defaultPrf); XmlWriter writer (Application::GetConfigFilePath (GetPreferencesFileName(), true)); writer.WriteNode (formatter.XmlConfig); -- cgit v1.2.3