1 files changed, 42 insertions, 19 deletions
diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h
index 5d9fff97..7d99f233 100644
--- a/src/Common/Crypto.h
+++ b/src/Common/Crypto.h
@@ -1,11 +1,11 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of TrueCrypt 7.1a, which is
- Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
  governed by the TrueCrypt License 3.0, also from the source code of
  Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
- and which is governed by the 'License Agreement for Encryption for the Masses'
- Modifications and additions to the original source code (contained in this file)
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ Modifications and additions to the original source code (contained in this file) 
  and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
@@ -45,20 +45,21 @@ extern "C" {
 #define MASTER_KEYDATA_SIZE			256
 
 // The first PRF to try when mounting
-#define FIRST_PRF_ID		1
+#define FIRST_PRF_ID		1	
 
-// Hash algorithms (pseudorandom functions).
+// Hash algorithms (pseudorandom functions). 
 enum
 {
 	SHA512 = FIRST_PRF_ID,
 	WHIRLPOOL,
 	SHA256,
 	RIPEMD160,
+	STREEBOG,
 	HASH_ENUM_END_ID
 };
 
 // The last PRF to try when mounting and also the number of implemented PRFs
-#define LAST_PRF_ID			(HASH_ENUM_END_ID - 1)
+#define LAST_PRF_ID			(HASH_ENUM_END_ID - 1)	
 
 #define RIPEMD160_BLOCKSIZE		64
 #define RIPEMD160_DIGESTSIZE	20
@@ -72,6 +73,9 @@ enum
 #define WHIRLPOOL_BLOCKSIZE		64
 #define WHIRLPOOL_DIGESTSIZE	64
 
+#define STREEBOG_BLOCKSIZE 64
+#define STREEBOG_DIGESTSIZE 64
+
 #define MAX_DIGESTSIZE			WHIRLPOOL_DIGESTSIZE
 
 #define DEFAULT_HASH_ALGORITHM			FIRST_PRF_ID
@@ -105,8 +109,11 @@ enum
 {
 	NONE = 0,
 	AES,
-	SERPENT,
-	TWOFISH
+	SERPENT,			
+	TWOFISH,
+	CAMELLIA,
+	GOST89,
+	KUZNYECHIK
 };
 
 typedef struct
@@ -126,6 +133,9 @@ typedef struct
 {
 	int Ciphers[4];			// Null terminated array of ciphers used by encryption algorithm
 	int Modes[LAST_MODE_OF_OPERATION + 1];			// Null terminated array of modes of operation
+#ifndef TC_WINDOWS_BOOT
+	BOOL MbrSysEncEnabled;
+#endif
 	int FormatEnabled;
 } EncryptionAlgorithm;
 
@@ -155,12 +165,16 @@ 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
-
-#define MAX_EXPANDED_KEY	(AES_KS + SERPENT_KS + TWOFISH_KS)
-
+#ifdef TC_WINDOWS_BOOT
+#define MAX_EXPANDED_KEY	max((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
+#else
+#define MAX_EXPANDED_KEY	max(max(max((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS), KUZNYECHIK_KS)
+#endif
 #endif
 
 #ifdef DEBUG
@@ -186,6 +200,12 @@ typedef struct
 #ifndef TC_WINDOWS_BOOT
 #	include "Sha2.h"
 #	include "Whirlpool.h"
+#	include "Streebog.h"
+#	include "GostCipher.h"
+#	include "kuznyechik.h"
+#	include "Camellia.h"
+#else
+#	include "CamelliaSmall.h"
 #endif
 
 #include "GfMul.h"
@@ -201,7 +221,7 @@ typedef struct keyInfo_t
 	int keyLength;						/* Length of the key */
 	uint64 dummy;						/* Dummy field to ensure 16-byte alignment of this structure */
 	__int8 salt[PKCS5_SALT_SIZE];		/* PKCS-5 salt */
-	__int8 master_keydata[MASTER_KEYDATA_SIZE];		/* Concatenated master primary and secondary key(s) (XTS mode). For LRW (deprecated/legacy), it contains the tweak key before the master key(s). For CBC (deprecated/legacy), it contains the IV seed before the master key(s). */
+	CRYPTOPP_ALIGN_DATA(16) __int8 master_keydata[MASTER_KEYDATA_SIZE];		/* Concatenated master primary and secondary key(s) (XTS mode). For LRW (deprecated/legacy), it contains the tweak key before the master key(s). For CBC (deprecated/legacy), it contains the IV seed before the master key(s). */
 	CRYPTOPP_ALIGN_DATA(16) __int8 userKey[MAX_PASSWORD];		/* Password (to which keyfiles may have been applied). WITHOUT +1 for the null terminator. */
 } KEY_INFO, *PKEY_INFO;
 
@@ -221,12 +241,12 @@ typedef struct CRYPTO_INFO_t
 #ifndef TC_WINDOWS_BOOT
 	uint16 HeaderVersion;
 
-	GfCtx gf_ctx;
+	GfCtx gf_ctx; 
 
-	unsigned __int8 master_keydata[MASTER_KEYDATA_SIZE];	/* This holds the volume header area containing concatenated master key(s) and secondary key(s) (XTS mode). For LRW (deprecated/legacy), it contains the tweak key before the master key(s). For CBC (deprecated/legacy), it contains the IV seed before the master key(s). */
-	unsigned __int8 k2[MASTER_KEYDATA_SIZE];				/* For XTS, this contains the secondary key (if cascade, multiple concatenated). For LRW (deprecated/legacy), it contains the tweak key. For CBC (deprecated/legacy), it contains the IV seed. */
+	CRYPTOPP_ALIGN_DATA(16) unsigned __int8 master_keydata[MASTER_KEYDATA_SIZE];	/* This holds the volume header area containing concatenated master key(s) and secondary key(s) (XTS mode). For LRW (deprecated/legacy), it contains the tweak key before the master key(s). For CBC (deprecated/legacy), it contains the IV seed before the master key(s). */
+	CRYPTOPP_ALIGN_DATA(16) unsigned __int8 k2[MASTER_KEYDATA_SIZE];				/* For XTS, this contains the secondary key (if cascade, multiple concatenated). For LRW (deprecated/legacy), it contains the tweak key. For CBC (deprecated/legacy), it contains the IV seed. */
 	unsigned __int8 salt[PKCS5_SALT_SIZE];
-	int noIterations;
+	int noIterations;	
 	BOOL bTrueCryptMode;
 	int volumePim;
 
@@ -235,7 +255,7 @@ typedef struct CRYPTO_INFO_t
 
 	BOOL bProtectHiddenVolume;			// Indicates whether the volume contains a hidden volume to be protected against overwriting
 	BOOL bHiddenVolProtectionAction;		// TRUE if a write operation has been denied by the driver in order to prevent the hidden volume from being overwritten (set to FALSE upon volume mount).
-
+	
 	uint64 volDataAreaOffset;		// Absolute position, in bytes, of the first data sector of the volume.
 
 	uint64 hiddenVolumeSize;		// Size of the hidden volume excluding the header (in bytes). Set to 0 for standard volumes.
@@ -262,7 +282,7 @@ typedef struct CRYPTO_INFO_t
 
 } CRYPTO_INFO, *PCRYPTO_INFO;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_UEFI)
 
 #pragma pack (push)
 #pragma pack(1)
@@ -331,6 +351,9 @@ int EAGetLastCipher (int ea);
 int EAGetNextCipher (int ea, int previousCipherId);
 int EAGetPreviousCipher (int ea, int previousCipherId);
 int EAIsFormatEnabled (int ea);
+#ifndef TC_WINDOWS_BOOT
+int EAIsMbrSysEncEnabled (int ea);
+#endif
 BOOL EAIsModeSupported (int ea, int testedMode);