diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-01-31 01:05:19 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-02-01 00:35:50 +0100 |
| commit | 61c1baa4bf5a97675187a37cf203e1937a060daa (patch) | |
| tree | dbf4cba079f6497740fecd325b22bf47f6a03731 /src/Crypto/Makefile.inc | |
| parent | 915855f43b6bd30c2e01a49e261f813ccc7a0237 (diff) | |
| download | VeraCrypt-61c1baa4bf5a97675187a37cf203e1937a060daa.tar.gz VeraCrypt-61c1baa4bf5a97675187a37cf203e1937a060daa.zip | |
Windows: use CPU RDRAND or RDSEED as an additional entropy source for our random generator when available
Diffstat (limited to 'src/Crypto/Makefile.inc')
| -rw-r--r-- | src/Crypto/Makefile.inc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/Crypto/Makefile.inc b/src/Crypto/Makefile.inc index 016451ad..86b7a6fa 100644 --- a/src/Crypto/Makefile.inc +++ b/src/Crypto/Makefile.inc @@ -1,12 +1,17 @@ TC_ASFLAGS = -Xvc -Ox VC_YASMFLAGS = -Xvc -D WINABI -D __YASM__ +VC_MLFLAGS = /nologo /W3 /Cx /Zi +VC_MLEXE = ml.exe !if "$(TC_ARCH)" == "x86" TC_ASFLAGS = $(TC_ASFLAGS) -f win32 --prefix _ -D MS_STDCALL -D DLL_EXPORT VC_YASMFLAGS = $(VC_YASMFLAGS) -f win32 -D MS_STDCALL +VC_MLFLAGS = $(VC_MLFLAGS) /D_M_X86 /safeseh !else TC_ASFLAGS = $(TC_ASFLAGS) -f win64 VC_YASMFLAGS = $(VC_YASMFLAGS) -f win64 +VC_MLFLAGS = $(VC_MLFLAGS) /D_M_X64 +VC_MLEXE = ml64.exe !endif TC_ASM_ERR_LOG = ..\Driver\build_errors_asm.log @@ -52,3 +57,7 @@ TC_ASM_ERR_LOG = ..\Driver\build_errors_asm.log "$(OBJ_PATH)\$(O)\sha256_sse4_$(TC_ARCH).obj": sha256_sse4_$(TC_ARCH).asm yasm.exe $(VC_YASMFLAGS) -o "$@" -l "$(OBJ_PATH)\$(O)\sha256_sse4_$(TC_ARCH).lst" sha256_sse4_$(TC_ARCH).asm 2>$(TC_ASM_ERR_LOG) + +"$(OBJ_PATH)\$(O)\rdrand_ml.obj": rdrand_ml.asm + $(VC_MLEXE) $(VC_MLFLAGS) /Fo "$@" /c rdrand_ml.asm 2>$(TC_ASM_ERR_LOG) + |