From 7df9724e20005ccdd3e5daaeebf80eb0c5c46083 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
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/EncryptionAlgorithm.cpp | 51 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'src/Volume/EncryptionAlgorithm.cpp')

diff --git a/src/Volume/EncryptionAlgorithm.cpp b/src/Volume/EncryptionAlgorithm.cpp
index e36b500c..b94f69fa 100644
--- a/src/Volume/EncryptionAlgorithm.cpp
+++ b/src/Volume/EncryptionAlgorithm.cpp
@@ -69,6 +69,11 @@ namespace VeraCrypt
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new Kuznyechik ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofish ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new AESTwofishSerpent ()));
+		l.push_back (shared_ptr <EncryptionAlgorithm> (new CamelliaKuznyechik ()));
+		l.push_back (shared_ptr <EncryptionAlgorithm> (new CamelliaSerpent ()));
+		l.push_back (shared_ptr <EncryptionAlgorithm> (new KuznyechikAES ()));
+		l.push_back (shared_ptr <EncryptionAlgorithm> (new KuznyechikSerpentCamellia ()));
+		l.push_back (shared_ptr <EncryptionAlgorithm> (new KuznyechikTwofish ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentAES ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new SerpentTwofishAES ()));
 		l.push_back (shared_ptr <EncryptionAlgorithm> (new TwofishSerpent ()));
@@ -314,4 +319,50 @@ namespace VeraCrypt
 
 		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
 	}
+	
+	// Kuznyechik-Twofish
+	KuznyechikTwofish::KuznyechikTwofish ()
+	{
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherTwofish ()));
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
+
+		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
+	}
+	
+	// Kuznyechik-AES
+	KuznyechikAES::KuznyechikAES ()
+	{
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherAES ()));
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
+
+		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
+	}
+	
+	// Kuznyechik-Serpent-Camellia
+	KuznyechikSerpentCamellia::KuznyechikSerpentCamellia ()
+	{
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherCamellia ()));
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherSerpent ()));
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
+
+		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
+	}
+	
+	// Camellia-Kuznyechik
+	CamelliaKuznyechik::CamelliaKuznyechik ()
+	{
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherCamellia ()));
+
+		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
+	}
+	
+	// Camellia-Serpent
+	CamelliaSerpent::CamelliaSerpent ()
+	{
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherSerpent ()));
+		Ciphers.push_back (shared_ptr <Cipher> (new CipherCamellia ()));
+
+		SupportedModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS ()));
+	}
 }
-- 
cgit v1.2.3