From 4b9f8b232b956149850fc1c8b47f826a09044efa Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 20 Dec 2014 15:04:07 +0100 Subject: Reduce time for reporting wrong password by removing support for legacy hidden format because it was never functional and it was superseded by current hidden format. --- src/Volume/VolumeLayout.cpp | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'src/Volume/VolumeLayout.cpp') diff --git a/src/Volume/VolumeLayout.cpp b/src/Volume/VolumeLayout.cpp index fb75a869..21c00b54 100644 --- a/src/Volume/VolumeLayout.cpp +++ b/src/Volume/VolumeLayout.cpp @@ -28,7 +28,6 @@ namespace VeraCrypt layouts.push_back (shared_ptr (new VolumeLayoutV2Normal ())); layouts.push_back (shared_ptr (new VolumeLayoutV1Normal ())); layouts.push_back (shared_ptr (new VolumeLayoutV2Hidden ())); - layouts.push_back (shared_ptr (new VolumeLayoutV1Hidden ())); layouts.push_back (shared_ptr (new VolumeLayoutSystemEncryption ())); if (type != VolumeType::Unknown) @@ -85,35 +84,6 @@ namespace VeraCrypt } - VolumeLayoutV1Hidden::VolumeLayoutV1Hidden () - { - Type = VolumeType::Hidden; - HeaderOffset = -TC_HIDDEN_VOLUME_HEADER_OFFSET_LEGACY; - HeaderSize = TC_VOLUME_HEADER_SIZE_LEGACY; - - SupportedEncryptionAlgorithms.push_back (shared_ptr (new AES ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new Serpent ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new Twofish ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofish ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofishSerpent ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new SerpentAES ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new SerpentTwofishAES ())); - SupportedEncryptionAlgorithms.push_back (shared_ptr (new TwofishSerpent ())); - - SupportedEncryptionModes.push_back (shared_ptr (new EncryptionModeXTS ())); - } - - uint64 VolumeLayoutV1Hidden::GetDataOffset (uint64 volumeHostSize) const - { - return volumeHostSize - GetDataSize (volumeHostSize) + HeaderOffset; - } - - uint64 VolumeLayoutV1Hidden::GetDataSize (uint64 volumeHostSize) const - { - return Header->GetHiddenVolumeDataSize (); - } - - VolumeLayoutV2Normal::VolumeLayoutV2Normal () { Type = VolumeType::Normal; -- cgit v1.2.3