merge of '17389a973545d2f8e25813894cdd2da1b01aa534'

     and 'ada4c9893d70affd8934ab9664e390087feab3c9'

1 files changed, 3 insertions, 0 deletions

diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index 83fb31406..1db9ca44c 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -8,6 +8,7 @@
 #include <botan/libstate.h>
 #include <botan/charset.h>
 #include <botan/engine.h>
+#include <botan/cpuid.h>
 #include <botan/internal/defalloc.h>
 #include <botan/internal/default_engine.h>
 #include <botan/internal/mutex.h>
@@ -241,6 +242,8 @@ RandomNumberGenerator& Library_State::global_rng()
 */
 void Library_State::initialize(bool thread_safe)
    {
+   CPUID::initialize();
+
    if(mutex_factory)
       throw Invalid_State("Library_State has already been initialized");