4 changed files with 52 additions and 9 deletions
@ -1 +0,0 @@
|
||||
44717d24b8deff2db9dd0365572063e38bbe4a59438a8c3c07675b5eed370358 VeraCrypt_1.21_Source.tar.bz2 |
@ -0,0 +1 @@
|
||||
8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c VeraCrypt_1.24-Hotfix1_Source.tar.bz2 |
@ -0,0 +1,39 @@
|
||||
diff -Naur orig/src/Crypto/jitterentropy-base-user.h mod/src/Crypto/jitterentropy-base-user.h
|
||||
--- orig/src/Crypto/jitterentropy-base-user.h 2019-10-27 12:10:18.000000000 +0000
|
||||
+++ mod/src/Crypto/jitterentropy-base-user.h 2019-12-15 23:26:23.663508743 +0000
|
||||
@@ -49,8 +49,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
-typedef uint64 __u64;
|
||||
-
|
||||
#ifdef _MSC_VER
|
||||
|
||||
typedef uint64 uint64_t;
|
||||
@@ -70,7 +68,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-static VC_INLINE void jent_get_nstime(__u64 *out)
|
||||
+static VC_INLINE void jent_get_nstime(uint64 *out)
|
||||
{
|
||||
*out = __rdtsc();;
|
||||
}
|
||||
@@ -80,7 +78,7 @@
|
||||
/* taken from Linux kernel */
|
||||
#if CRYPTOPP_BOOL_X64
|
||||
#define DECLARE_ARGS(val, low, high) unsigned low, high
|
||||
-#define EAX_EDX_VAL(val, low, high) ((low) | ((__u64)(high) << 32))
|
||||
+#define EAX_EDX_VAL(val, low, high) ((low) | ((uint64)(high) << 32))
|
||||
#define EAX_EDX_RET(val, low, high) "=a" (low), "=d" (high)
|
||||
#else
|
||||
#define DECLARE_ARGS(val, low, high) unsigned long long val
|
||||
@@ -88,7 +86,7 @@
|
||||
#define EAX_EDX_RET(val, low, high) "=A" (val)
|
||||
#endif
|
||||
|
||||
-VC_INLINE void jent_get_nstime(__u64 *out)
|
||||
+VC_INLINE void jent_get_nstime(uint64 *out)
|
||||
{
|
||||
DECLARE_ARGS(val, low, high);
|
||||
asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
|
Loading…
Reference in new issue