diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-03-02 10:14:21 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-03-02 10:23:39 +0100 |
| commit | 321715202aed04dd9892d1c0686d080763ab212d (patch) | |
| tree | 770d69a4a7bbb992ab0aaf4cb4625e07d2a5255b /src/Common/Crypto.c | |
| parent | edd1b00126fa39396fbb76c73cc3ea17aa955fc8 (diff) | |
| download | VeraCrypt-321715202aed04dd9892d1c0686d080763ab212d.tar.gz VeraCrypt-321715202aed04dd9892d1c0686d080763ab212d.zip | |
Windows: Generalize RAM encryption for keys to VeraCrypt binaries, especially Format and Expander
Diffstat (limited to 'src/Common/Crypto.c')
| -rw-r--r-- | src/Common/Crypto.c | 10 |
1 files changed, 8 insertions, 2 deletions
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; } |