VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/Crypto.h
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-06-01 22:10:39 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-06-01 22:12:00 (GMT)
commit76d3bc631eff60841026f2526d69f6d661d218a3 (patch)
treececc43976a8c45029b35b08ba3af0819ebee3993 /src/Common/Crypto.h
parent99c4031d89ce4f72e3899b3cac660082a1820a48 (diff)
downloadVeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.zip
VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.tar.gz
Crypto: Add support for Japanese encryption standard Camellia, including for system encryption.
Diffstat (limited to 'src/Common/Crypto.h')
-rw-r--r--src/Common/Crypto.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h
index 5d9fff9..28b5f8c 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"