From c178e325b807258199ae45b2c50c265b4d7ce7af Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 30 Dec 2014 17:01:49 +0100 Subject: Linux/MacOSX: Implement TrueCrypt conversion and loading support. Correct many GTK issues linked to multi-threaded origine of events by implementing an automatic mechanism for handling such requests in the main thread. --- src/Volume/VolumeLayout.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Volume/VolumeLayout.cpp') diff --git a/src/Volume/VolumeLayout.cpp b/src/Volume/VolumeLayout.cpp index 21c00b54..d871baa8 100644 --- a/src/Volume/VolumeLayout.cpp +++ b/src/Volume/VolumeLayout.cpp @@ -196,12 +196,12 @@ namespace VeraCrypt return volumeHostSize; } - Pkcs5KdfList VolumeLayoutSystemEncryption::GetSupportedKeyDerivationFunctions () const + Pkcs5KdfList VolumeLayoutSystemEncryption::GetSupportedKeyDerivationFunctions (bool truecryptMode) const { Pkcs5KdfList l; - - l.push_back (shared_ptr (new Pkcs5HmacSha256_Boot ())); - l.push_back (shared_ptr (new Pkcs5HmacRipemd160_1000 ())); + if (!truecryptMode) + l.push_back (shared_ptr (new Pkcs5HmacSha256_Boot ())); + l.push_back (shared_ptr (new Pkcs5HmacRipemd160_1000 (truecryptMode))); return l; } } -- cgit v1.2.3