From 76d3bc631eff60841026f2526d69f6d661d218a3 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Thu, 2 Jun 2016 00:10:39 +0200 Subject: Crypto: Add support for Japanese encryption standard Camellia, including for system encryption. --- src/Volume/EncryptionAlgorithm.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/Volume/EncryptionAlgorithm.cpp') 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 (new AES ())); l.push_back (shared_ptr (new Serpent ())); l.push_back (shared_ptr (new Twofish ())); + l.push_back (shared_ptr (new Camellia ())); l.push_back (shared_ptr (new AESTwofish ())); l.push_back (shared_ptr (new AESTwofishSerpent ())); l.push_back (shared_ptr (new SerpentAES ())); @@ -284,4 +285,12 @@ namespace VeraCrypt SupportedModes.push_back (shared_ptr (new EncryptionModeXTS ())); } + + // Camellia + Camellia::Camellia () + { + Ciphers.push_back (shared_ptr (new CipherCamellia())); + + SupportedModes.push_back (shared_ptr (new EncryptionModeXTS ())); + } } -- cgit v1.2.3