diff options
Diffstat (limited to 'src/Volume/VolumeLayout.cpp')
| -rw-r--r-- | src/Volume/VolumeLayout.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/Volume/VolumeLayout.cpp b/src/Volume/VolumeLayout.cpp index aeade493..a3ecab02 100644 --- a/src/Volume/VolumeLayout.cpp +++ b/src/Volume/VolumeLayout.cpp | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include "Volume/EncryptionMode.h" | 9 | #include "Volume/EncryptionMode.h" |
| 10 | #include "Volume/EncryptionModeCBC.h" | ||
| 11 | #include "Volume/EncryptionModeLRW.h" | ||
| 12 | #include "Volume/EncryptionModeXTS.h" | 10 | #include "Volume/EncryptionModeXTS.h" |
| 13 | #include "VolumeLayout.h" | 11 | #include "VolumeLayout.h" |
| 14 | #include "Boot/Windows/BootCommon.h" | 12 | #include "Boot/Windows/BootCommon.h" |
| @@ -73,15 +71,7 @@ namespace VeraCrypt | |||
| 73 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ())); | 71 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ())); |
| 74 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ())); | 72 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ())); |
| 75 | 73 | ||
| 76 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESBlowfish ())); | ||
| 77 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESBlowfishSerpent ())); | ||
| 78 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Blowfish ())); | ||
| 79 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Cast5 ())); | ||
| 80 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TripleDES ())); | ||
| 81 | |||
| 82 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ())); | 74 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ())); |
| 83 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeLRW ())); | ||
| 84 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeCBC ())); | ||
| 85 | } | 75 | } |
| 86 | 76 | ||
| 87 | uint64 VolumeLayoutV1Normal::GetDataOffset (uint64 volumeHostSize) const | 77 | uint64 VolumeLayoutV1Normal::GetDataOffset (uint64 volumeHostSize) const |
| @@ -110,15 +100,7 @@ namespace VeraCrypt | |||
| 110 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ())); | 100 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ())); |
| 111 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ())); | 101 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ())); |
| 112 | 102 | ||
| 113 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESBlowfish ())); | ||
| 114 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AESBlowfishSerpent ())); | ||
| 115 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Blowfish ())); | ||
| 116 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new Cast5 ())); | ||
| 117 | SupportedEncryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new TripleDES ())); | ||
| 118 | |||
| 119 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ())); | 103 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ())); |
| 120 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeLRW ())); | ||
| 121 | SupportedEncryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeCBC ())); | ||
| 122 | } | 104 | } |
| 123 | 105 | ||
| 124 | uint64 VolumeLayoutV1Hidden::GetDataOffset (uint64 volumeHostSize) const | 106 | uint64 VolumeLayoutV1Hidden::GetDataOffset (uint64 volumeHostSize) const |