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/Common/Crypto.c |   5 ++
 src/Common/Crypto.h |   2 +-
 src/Common/Tests.c  | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 168 insertions(+), 3 deletions(-)

(limited to 'src/Common')

diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c
index 3f7e9871..00d44a93 100644
--- a/src/Common/Crypto.c
+++ b/src/Common/Crypto.c
@@ -87,6 +87,11 @@ static EncryptionAlgorithm EncryptionAlgorithms[] =
 	{ { AES, SERPENT,				0 }, { XTS, 0 },	1, 1 },
 	{ { AES, TWOFISH, SERPENT,	0 }, { XTS, 0 },	1, 1 },
 	{ { SERPENT, TWOFISH,		0 }, { XTS, 0 },	1, 1 },
+	{ { KUZNYECHIK, CAMELLIA,		0 }, { XTS, 0 },	0, 1 },
+	{ { TWOFISH, KUZNYECHIK,		0 }, { XTS, 0 },	0, 1 },
+	{ { SERPENT, CAMELLIA,		0 }, { XTS, 0 },	0, 1 },
+	{ { AES, KUZNYECHIK,		0 }, { XTS, 0 },	0, 1 },
+	{ { CAMELLIA, SERPENT, KUZNYECHIK,	0 }, { XTS, 0 },	0, 1 },
 	{ { 0,							0 }, { 0,    0},	0, 0 }		// Must be all-zero
 
 #else // TC_WINDOWS_BOOT
diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h
index 1d0c96e5..e66cfbab 100644
--- a/src/Common/Crypto.h
+++ b/src/Common/Crypto.h
@@ -173,7 +173,7 @@ typedef struct
 #ifdef TC_WINDOWS_BOOT
 #define MAX_EXPANDED_KEY	VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
 #else
-#define MAX_EXPANDED_KEY	VC_MAX(VC_MAX(VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS), KUZNYECHIK_KS)
+#define MAX_EXPANDED_KEY	VC_MAX(VC_MAX(VC_MAX(VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS + KUZNYECHIK_KS + SERPENT_KS), KUZNYECHIK_KS + TWOFISH_KS), AES_KS + KUZNYECHIK_KS)
 #endif
 #endif
 
diff --git a/src/Common/Tests.c b/src/Common/Tests.c
index 77a7aa2e..e83f556f 100644
--- a/src/Common/Tests.c
+++ b/src/Common/Tests.c
@@ -1030,6 +1030,136 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 					break;
 				}
 			}
+			else if (wcscmp (name, L"Camellia-Kuznyechik") == 0)
+			{
+				switch (testCase)
+				{
+				case 0:
+					if (crc != 0x4ea34e89)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 1:
+					if (crc != 0xb3ad8559)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 2:
+					if (crc != 0xde361313)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 3:
+					if (crc != 0x519d2bf9)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				}
+			}
+			else if (wcscmp (name, L"Kuznyechik-Twofish") == 0)
+			{
+				switch (testCase)
+				{
+				case 0:
+					if (crc != 0x748f8631)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 1:
+					if (crc != 0x8a4b0888)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 2:
+					if (crc != 0xe0310188)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 3:
+					if (crc != 0xfc2b6b45)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				}
+			}
+			else if (wcscmp (name, L"Camellia-Serpent") == 0)
+			{
+				switch (testCase)
+				{
+				case 0:
+					if (crc != 0x10569a42)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 1:
+					if (crc != 0x4de95152)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 2:
+					if (crc != 0xe17b5fe7)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 3:
+					if (crc != 0xdbf993fa)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				}
+			}
+			else if (wcscmp (name, L"Kuznyechik-AES") == 0)
+			{
+				switch (testCase)
+				{
+				case 0:
+					if (crc != 0xc479f95d)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 1:
+					if (crc != 0x58eaf88d)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 2:
+					if (crc != 0xbe300cc2)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 3:
+					if (crc != 0x9b681c2e)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				}
+			}
+			else if (wcscmp (name, L"Kuznyechik-Serpent-Camellia") == 0)
+			{
+				switch (testCase)
+				{
+				case 0:
+					if (crc != 0x9d8ac7ee)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 1:
+					if (crc != 0x5d7d347f)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 2:
+					if (crc != 0x884b62ee)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				case 3:
+					if (crc != 0x5c6c3997)
+						return FALSE;
+					nTestsPerformed++;
+					break;
+				}
+			}
 
 			if (crc == 0x9f5edd58)
 				return FALSE;
@@ -1144,6 +1274,36 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 				return FALSE;
 			nTestsPerformed++;
 		}
+		else if (wcscmp (name, L"Camellia-Kuznyechik") == 0)
+		{
+			if (crc != 0xe69d680d)
+				return FALSE;
+			nTestsPerformed++;
+		}
+		else if (wcscmp (name, L"Kuznyechik-Twofish") == 0)
+		{
+			if (crc != 0xe0aef0d1)
+				return FALSE;
+			nTestsPerformed++;
+		}
+		else if (wcscmp (name, L"Camellia-Serpent") == 0)
+		{
+			if (crc != 0x58aad727)
+				return FALSE;
+			nTestsPerformed++;
+		}
+		else if (wcscmp (name, L"Kuznyechik-AES") == 0)
+		{
+			if (crc != 0x4641234a)
+				return FALSE;
+			nTestsPerformed++;
+		}
+		else if (wcscmp (name, L"Kuznyechik-Serpent-Camellia") == 0)
+		{
+			if (crc != 0x755dad72)
+				return FALSE;
+			nTestsPerformed++;
+		}
 
 		if (crc == 0x9f5edd58)
 			return FALSE;
@@ -1156,9 +1316,9 @@ BOOL TestSectorBufEncryption (PCRYPTO_INFO ci)
 		nTestsPerformed++;
 	}
 #if defined(CIPHER_GOST89)
-	return (nTestsPerformed == 110);
+	return (nTestsPerformed == 160);
 #else
-	return (nTestsPerformed == 105);
+	return (nTestsPerformed == 155);
 #endif
 }
 
-- 
cgit v1.2.3