diff options
Diffstat (limited to 'src/Core/MountOptions.cpp')
| -rw-r--r-- | src/Core/MountOptions.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Core/MountOptions.cpp b/src/Core/MountOptions.cpp index c3529efb..29f554e6 100644 --- a/src/Core/MountOptions.cpp +++ b/src/Core/MountOptions.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source @@ -102,14 +102,14 @@ namespace VeraCrypt sr.Deserialize ("UseBackupHeaders", UseBackupHeaders); sr.Deserialize ("TrueCryptMode", TrueCryptMode); - + try { if (!sr.DeserializeBool ("KdfNull")) { sr.Deserialize ("Kdf", nameValue); Kdf = Pkcs5Kdf::GetAlgorithm (nameValue, TrueCryptMode); - } + } } catch(...) {} @@ -122,7 +122,7 @@ namespace VeraCrypt } } catch(...) {} - + sr.Deserialize ("Pim", Pim); sr.Deserialize ("ProtectionPim", ProtectionPim); } @@ -144,7 +144,7 @@ namespace VeraCrypt sr.Serialize ("NoFilesystem", NoFilesystem); sr.Serialize ("NoHardwareCrypto", NoHardwareCrypto); sr.Serialize ("NoKernelCrypto", NoKernelCrypto); - + sr.Serialize ("PasswordNull", Password == nullptr); if (Password) Password->Serialize (stream); @@ -176,7 +176,7 @@ namespace VeraCrypt sr.Serialize ("ProtectionKdfNull", ProtectionKdf == nullptr); if (ProtectionKdf) sr.Serialize ("ProtectionKdf", ProtectionKdf->GetName()); - + sr.Serialize ("Pim", Pim); sr.Serialize ("ProtectionPim", ProtectionPim); } |