From 6b132d225e77a7d5e4ec4ed385c60e3e8505d308 Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 18 Mar 2015 10:53:03 +0000 Subject: Add timeouts to HMAC_RNG entropy polling --- src/build-data/buildh.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/build-data/buildh.in') 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__) -- cgit v1.2.3