aboutsummaryrefslogtreecommitdiffstats
path: root/src/build-data
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-03-18 10:53:03 +0000
committerlloyd <[email protected]>2015-03-18 10:53:03 +0000
commit6b132d225e77a7d5e4ec4ed385c60e3e8505d308 (patch)
tree26bab16c2299a2b490070297b39fcaee910e3534 /src/build-data
parent1543f11ec85934f3bb001dbd60c2d16917a5e7c1 (diff)
Add timeouts to HMAC_RNG entropy polling
Diffstat (limited to 'src/build-data')
-rw-r--r--src/build-data/buildh.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index e9115132f..f8009cf0b 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -45,8 +45,8 @@
#define BOTAN_MP_WORD_BITS %{mp_bits}
/*
-If enabled uses memset via volatile function pointer to zero memory,
-otherwise does a byte at a time write via a volatile pointer.
+* If enabled uses memset via volatile function pointer to zero memory,
+* otherwise does a byte at a time write via a volatile pointer.
*/
#define BOTAN_USE_VOLATILE_MEMSET_FOR_ZERO 1
@@ -62,11 +62,13 @@ otherwise does a byte at a time write via a volatile pointer.
#define BOTAN_PRIVATE_KEY_STRONG_CHECKS_ON_GENERATE 1
/*
-* RNGs will automatically poll the system for additional
-* seed material after producing this many bytes of output.
+* RNGs will automatically poll the system for additional seed material
+* after producing this many bytes of output.
*/
#define BOTAN_RNG_MAX_OUTPUT_BEFORE_RESEED 512
#define BOTAN_RNG_RESEED_POLL_BITS 128
+#define BOTAN_RNG_AUTO_RESEED_TIMEOUT std::chrono::milliseconds(20)
+#define BOTAN_RNG_RESEED_DEFAULT_TIMEOUT std::chrono::milliseconds(100)
/* Should we use GCC-style inline assembler? */
#if !defined(BOTAN_USE_GCC_INLINE_ASM) && defined(__GNUG__)