diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-06-02 00:10:39 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-06-02 00:12:00 +0200 |
| commit | 76d3bc631eff60841026f2526d69f6d661d218a3 (patch) | |
| tree | cecc43976a8c45029b35b08ba3af0819ebee3993 /src/Volume/EncryptionAlgorithm.cpp | |
| parent | 99c4031d89ce4f72e3899b3cac660082a1820a48 (diff) | |
| download | VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.tar.gz VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.zip | |
Crypto: Add support for Japanese encryption standard Camellia, including for system encryption.
Diffstat (limited to 'src/Volume/EncryptionAlgorithm.cpp')
| -rw-r--r-- | src/Volume/EncryptionAlgorithm.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/Volume/EncryptionAlgorithm.cpp b/src/Volume/EncryptionAlgorithm.cpp index 77ed8807..589db9b8 100644 --- a/src/Volume/EncryptionAlgorithm.cpp +++ b/src/Volume/EncryptionAlgorithm.cpp @@ -64,6 +64,7 @@ namespace VeraCrypt l.push_back (shared_ptr <EncryptionAlgorithm> (new AES ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new Serpent ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new Twofish ())); + l.push_back (shared_ptr <EncryptionAlgorithm> (new Camellia ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofish ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofishSerpent ())); l.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentAES ())); @@ -284,4 +285,12 @@ namespace VeraCrypt SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ())); } + + // Camellia + Camellia::Camellia () + { + Ciphers.push_back (shared_ptr <Cipher> (new CipherCamellia())); + + SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ())); + } } |