Move most of the remaining libstate code to pk_engine.cpp, move engines

back to the toplevel since most othe dependencies have been removed now
(except get_cipher which still needs changes)

3 files changed, 4 insertions, 8 deletions

diff --git a/src/algo_factory/algo_cache.h b/src/algo_factory/algo_cache.h
index dafa59c3e..a77828718 100644
--- a/src/algo_factory/algo_cache.h
+++ b/src/algo_factory/algo_cache.h
@@ -7,12 +7,14 @@
 
 #include <botan/scan_name.h>
 #include <botan/mutex.h>
-#include <stdexcept>
-#include <map>
 #include <string>
+#include <map>
 
 namespace Botan {
 
+/**
+* Algorithm_Cache (used by Algorithm_Factory)
+*/
 template<typename T>
 class Algorithm_Cache
    {
@@ -35,7 +37,6 @@ class Algorithm_Cache
       Mutex* mutex;
       std::map<std::string, std::string> aliases;
       std::map<std::string, std::map<std::string, T*> > algorithms;
-
    };
 
 /**
@@ -84,7 +85,6 @@ const T* Algorithm_Cache<T>::get(const SCAN_Name& request)
       }
    else // no specific provider requested: pick one
       {
-      printf("No specific provider requested for %s\n", request.as_string().c_str());
       provider_iterator provider = algo->second.begin();
 
       while(provider != algo->second.end())
diff --git a/src/algo_factory/algo_factory.cpp b/src/algo_factory/algo_factory.cpp
index e2debf7c9..e30d6d98b 100644
--- a/src/algo_factory/algo_factory.cpp
+++ b/src/algo_factory/algo_factory.cpp
@@ -18,7 +18,6 @@ Algorithm Factory
 namespace Botan {
 
 Algorithm_Factory::Algorithm_Factory(Mutex_Factory& mf) :
-   mutex_factory(mf),
    block_cipher_cache(mf.make()),
    stream_cipher_cache(mf.make()),
    hash_cache(mf.make()),
@@ -41,7 +40,6 @@ Algorithm_Factory::~Algorithm_Factory()
 */
 void Algorithm_Factory::add_engine(Engine* engine)
    {
-   engine->initialize(mutex_factory);
    engines.insert(engines.begin(), engine);
    }
 
diff --git a/src/algo_factory/algo_factory.h b/src/algo_factory/algo_factory.h
index 64b2128ec..07a8c93f1 100644
--- a/src/algo_factory/algo_factory.h
+++ b/src/algo_factory/algo_factory.h
@@ -68,8 +68,6 @@ class BOTAN_DLL Algorithm_Factory
       void add_mac(MessageAuthenticationCode* mac,
                    const std::string& provider);
    private:
-      Mutex_Factory& mutex_factory;
-
       class Engine* get_engine_n(u32bit) const;
 
       std::vector<class Engine*> engines;