From 321715202aed04dd9892d1c0686d080763ab212d Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sat, 2 Mar 2019 10:14:21 +0100
Subject: Windows: Generalize RAM encryption for keys to VeraCrypt binaries,
 especially Format and Expander

---
 src/Common/Crypto.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c
index 6a918953..501cd165 100644
--- a/src/Common/Crypto.c
+++ b/src/Common/Crypto.c
@@ -1295,7 +1295,7 @@ byte GetRandomIndex (ChaCha20RngCtx* pCtx, byte elementsCount)
 	return index;
 }
 
-#if defined(_WIN64) && !defined (_UEFI) && defined(TC_WINDOWS_DRIVER)
+#if defined(_WIN64) && !defined (_UEFI)
 /* declaration of variables and functions used for RAM encryption on 64-bit build */
 static byte* pbKeyDerivationArea = NULL;
 static ULONG cbKeyDerivationArea = 0;
@@ -1306,15 +1306,19 @@ static uint64 CipherIVMask = 0;
 ULONG AllocTag = 'MMCV';
 #endif
 
+#if !defined(PAGE_SIZE)
+#define PAGE_SIZE 4096
+#endif
+
 BOOL InitializeSecurityParameters(GetRandSeedFn rngCallback)
 {
 	ChaCha20RngCtx ctx;
 	byte pbSeed[CHACHA20RNG_KEYSZ + CHACHA20RNG_IVSZ];
 #ifdef TC_WINDOWS_DRIVER
 	byte i, tagLength;
-#endif
 
 	Dump ("InitializeSecurityParameters BEGIN\n");
+#endif
 
 	rngCallback (pbSeed, sizeof (pbSeed));
 
@@ -1362,9 +1366,11 @@ BOOL InitializeSecurityParameters(GetRandSeedFn rngCallback)
 
 	FAST_ERASE64 (pbSeed, sizeof (pbSeed));
 	burn (&ctx, sizeof (ctx));
+#ifdef TC_WINDOWS_DRIVER
 	burn (&tagLength, 1);
 
 	Dump ("InitializeSecurityParameters return=TRUE END\n");
+#endif
 	return TRUE;
 }
 
-- 
cgit v1.2.3