VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Crypto
diff options
context:
space:
mode:
Diffstat (limited to 'src/Crypto')
-rw-r--r--src/Crypto/cpu.h1
-rw-r--r--src/Crypto/jitterentropy-base.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Crypto/cpu.h b/src/Crypto/cpu.h
index e4e05a0c..58729f32 100644
--- a/src/Crypto/cpu.h
+++ b/src/Crypto/cpu.h
@@ -209,6 +209,7 @@ extern "C" {
#endif
#define CRYPTOPP_CPUID_AVAILABLE
+#define TC_AES_HW_CPU
// these should not be used directly
extern volatile int g_x86DetectionDone;
diff --git a/src/Crypto/jitterentropy-base.c b/src/Crypto/jitterentropy-base.c
index c3856b41..b7512532 100644
--- a/src/Crypto/jitterentropy-base.c
+++ b/src/Crypto/jitterentropy-base.c
@@ -53,7 +53,7 @@
#ifdef TC_WINDOWS_DRIVER
-#define UINT64_MAX 0xffffffffffffffffU
+#define UINT64_MAX 0xffffffffffffffffui64
#else
#include <stdint.h>
#endif
@@ -345,7 +345,7 @@ static uint64_t jent_loop_shuffle(struct rand_data *ec,
* We add a lower boundary value to ensure we have a minimum
* RNG loop count.
*/
- return (shuffle + (1<<min));
+ return (shuffle + (1ULL<<min));
}
/**