From 7df9724e20005ccdd3e5daaeebf80eb0c5c46083 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 27 Mar 2018 13:07:13 +0200 Subject: Crypto: Add support for 5 new cascades of cipher algorithms (Camellia-Kuznyechik, Camellia-Serpent, Kuznyechik-AES, Kuznyechik-Serpent-Camellia and Kuznyechik-Twofish) --- src/Volume/VolumeLayout.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/Volume/VolumeLayout.cpp') diff --git a/src/Volume/VolumeLayout.cpp b/src/Volume/VolumeLayout.cpp index 701bca84..0eaed427 100644 --- a/src/Volume/VolumeLayout.cpp +++ b/src/Volume/VolumeLayout.cpp @@ -104,6 +104,11 @@ namespace VeraCrypt SupportedEncryptionAlgorithms.push_back (shared_ptr (new Kuznyechik ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofish ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofishSerpent ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new CamelliaKuznyechik ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new CamelliaSerpent ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikAES ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikSerpentCamellia ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikTwofish ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new SerpentAES ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new SerpentTwofishAES ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new TwofishSerpent ())); @@ -145,6 +150,11 @@ namespace VeraCrypt SupportedEncryptionAlgorithms.push_back (shared_ptr (new Kuznyechik ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofish ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofishSerpent ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new CamelliaKuznyechik ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new CamelliaSerpent ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikAES ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikSerpentCamellia ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikTwofish ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new SerpentAES ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new SerpentTwofishAES ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new TwofishSerpent ())); @@ -193,10 +203,15 @@ namespace VeraCrypt SupportedEncryptionAlgorithms.push_back (shared_ptr (new Kuznyechik ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofish ())); SupportedEncryptionAlgorithms.push_back (shared_ptr (new AESTwofishSerpent ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new CamelliaKuznyechik ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new CamelliaSerpent ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikAES ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikSerpentCamellia ())); + SupportedEncryptionAlgorithms.push_back (shared_ptr (new KuznyechikTwofish ())); 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 ())); } -- cgit v1.2.3