aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstate
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 18:34:40 +0000
committerlloyd <[email protected]>2012-05-18 18:34:40 +0000
commitd76700f01c7ecac5633edf75f8d7408b46c5dbac (patch)
treea1264f4238d58ca774812acbac8d4beffd49e449 /src/libstate
parentab5c922f0e2635dc0e45fc757b27be9f28986acb (diff)
parente0070253386bfd39b2a782c66ccf0caf9ce87ca2 (diff)
propagate from branch 'net.randombit.botan' (head 6332543aa5a8a4cc13662008ff9ac0f0016d9a4d)
to branch 'net.randombit.botan.cxx11' (head 5517c9f8f6d1990f269afb94f569a97a80c5a5f4)
Diffstat (limited to 'src/libstate')
-rw-r--r--src/libstate/global_rng.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libstate/global_rng.cpp b/src/libstate/global_rng.cpp
index 066d033a1..f80146596 100644
--- a/src/libstate/global_rng.cpp
+++ b/src/libstate/global_rng.cpp
@@ -23,6 +23,10 @@
#include <botan/internal/hres_timer.h>
#endif
+#if defined(BOTAN_HAS_ENTROPY_SRC_RDRAND)
+ #include <botan/internal/rdrand.h>
+#endif
+
#if defined(BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM)
#include <botan/internal/dev_random.h>
#endif
@@ -64,6 +68,10 @@ void add_entropy_sources(RandomNumberGenerator* rng)
rng->add_entropy_source(new High_Resolution_Timestamp);
#endif
+#if defined(BOTAN_HAS_ENTROPY_SRC_RDRAND)
+ rng->add_entropy_source(new Intel_Rdrand);
+#endif
+
#if defined(BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM)
rng->add_entropy_source(
new Device_EntropySource(