diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-06-24 14:14:34 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-06-24 15:33:16 +0200 |
| commit | 9913af3a8ed61333cafd0e611f214f7c86652423 (patch) | |
| tree | bae9cbe7b95cb56df9d210cf32b44a0c15574ce8 /src/Core/MountOptions.cpp | |
| parent | f927ce9b58b137846bb78a47f5a83f7261eac9ff (diff) | |
| download | VeraCrypt-9913af3a8ed61333cafd0e611f214f7c86652423.tar.gz VeraCrypt-9913af3a8ed61333cafd0e611f214f7c86652423.zip | |
Linux/MacOSX: first dynamic mode implementation
Diffstat (limited to 'src/Core/MountOptions.cpp')
| -rwxr-xr-x[-rw-r--r--] | src/Core/MountOptions.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Core/MountOptions.cpp b/src/Core/MountOptions.cpp index 844d72b4..e78549fb 100644..100755 --- a/src/Core/MountOptions.cpp +++ b/src/Core/MountOptions.cpp @@ -25,8 +25,9 @@ namespace VeraCrypt TC_CLONE (NoFilesystem); TC_CLONE (NoHardwareCrypto); TC_CLONE (NoKernelCrypto); TC_CLONE_SHARED (VolumePassword, Password); + TC_CLONE (Pim); if (other.Kdf) { Kdf.reset(other.Kdf->Clone()); } @@ -36,8 +37,9 @@ namespace VeraCrypt TC_CLONE (PartitionInSystemEncryptionScope); TC_CLONE (PreserveTimestamps); TC_CLONE (Protection); TC_CLONE_SHARED (VolumePassword, ProtectionPassword); + TC_CLONE (ProtectionPim); if (other.ProtectionKdf) ProtectionKdf.reset(other.ProtectionKdf->Clone()); else ProtectionKdf.reset(); @@ -115,8 +117,11 @@ namespace VeraCrypt ProtectionKdf = Pkcs5Kdf::GetAlgorithm (nameValue, TrueCryptMode); } } catch(...) {} + + sr.Deserialize ("Pim", Pim); + sr.Deserialize ("ProtectionPim", ProtectionPim); } void MountOptions::Serialize (shared_ptr <Stream> stream) const { @@ -166,8 +171,11 @@ namespace VeraCrypt sr.Serialize ("ProtectionKdfNull", ProtectionKdf == nullptr); if (ProtectionKdf) sr.Serialize ("ProtectionKdf", ProtectionKdf->GetName()); + + sr.Serialize ("Pim", Pim); + sr.Serialize ("ProtectionPim", ProtectionPim); } TC_SERIALIZER_FACTORY_ADD_CLASS (MountOptions); } |