From 76d3bc631eff60841026f2526d69f6d661d218a3 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Thu, 2 Jun 2016 00:10:39 +0200
Subject: Crypto: Add support for Japanese encryption standard Camellia,
 including for system encryption.

---
 src/Common/Crypto.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/Common/Crypto.h')

diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h
index 5d9fff97..28b5f8c4 100644
--- a/src/Common/Crypto.h
+++ b/src/Common/Crypto.h
@@ -106,7 +106,8 @@ enum
 	NONE = 0,
 	AES,
 	SERPENT,
-	TWOFISH
+	TWOFISH,
+	CAMELLIA
 };
 
 typedef struct
@@ -155,6 +156,8 @@ typedef struct
 #		define MAX_EXPANDED_KEY	SERPENT_KS
 #	elif defined (TC_WINDOWS_BOOT_TWOFISH)
 #		define MAX_EXPANDED_KEY	TWOFISH_KS
+#	elif defined (TC_WINDOWS_BOOT_CAMELLIA)
+#		define MAX_EXPANDED_KEY	CAMELLIA_KS
 #	endif
 
 #else
@@ -186,6 +189,9 @@ typedef struct
 #ifndef TC_WINDOWS_BOOT
 #	include "Sha2.h"
 #	include "Whirlpool.h"
+#  include "Camellia.h"
+#else
+#  include "CamelliaSmall.h"
 #endif
 
 #include "GfMul.h"
-- 
cgit v1.2.3