aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-04-28 23:32:21 +0000
committerlloyd <[email protected]>2010-04-28 23:32:21 +0000
commitb724994a7385e4ddd2e4e0684383302271ea2bf9 (patch)
treed46b3cc47d5f0260d98b59898ead08782984473f
parent842364f5251693a3b8e1115f365fde5c112a2442 (diff)
Merge fixups re mutex changes
-rw-r--r--src/libstate/global_rng.cpp1
-rw-r--r--src/libstate/libstate.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstate/global_rng.cpp b/src/libstate/global_rng.cpp
index c5dcaab00..a79c72c00 100644
--- a/src/libstate/global_rng.cpp
+++ b/src/libstate/global_rng.cpp
@@ -6,7 +6,6 @@
*/
#include <botan/libstate.h>
-#include <botan/internal/mutex.h>
#if defined(BOTAN_HAS_RANDPOOL)
#include <botan/randpool.h>
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index e37617c94..7b0f4c417 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -237,7 +237,7 @@ void Library_State::initialize()
load_default_config();
- m_algorithm_factory = new Algorithm_Factory(*mutex_factory);
+ m_algorithm_factory = new Algorithm_Factory();
#if defined(BOTAN_HAS_ENGINE_GNU_MP)
algorithm_factory().add_engine(new GMP_Engine);