In Algorithm_Factory, create the Algorithm_Cache<> objects dynamically

so that algo_cache.h does not have to be visible in the source of all
callers who include libstate.h/algo_factory.h

1 files changed, 6 insertions, 5 deletions

diff --git a/src/algo_factory/algo_factory.h b/src/algo_factory/algo_factory.h
index c71594ee3..9c989b749 100644
--- a/src/algo_factory/algo_factory.h
+++ b/src/algo_factory/algo_factory.h
@@ -6,7 +6,6 @@
 #ifndef BOTAN_ALGORITHM_FACTORY_H__
 #define BOTAN_ALGORITHM_FACTORY_H__
 
-#include <botan/algo_cache.h>
 #include <botan/mutex.h>
 #include <string>
 #include <vector>
@@ -21,6 +20,8 @@ class StreamCipher;
 class HashFunction;
 class MessageAuthenticationCode;
 
+template<typename T> class Algorithm_Cache;
+
 class Engine;
 
 /**
@@ -118,10 +119,10 @@ class BOTAN_DLL Algorithm_Factory
 
       std::vector<class Engine*> engines;
 
-      Algorithm_Cache<BlockCipher> block_cipher_cache;
-      Algorithm_Cache<StreamCipher> stream_cipher_cache;
-      Algorithm_Cache<HashFunction> hash_cache;
-      Algorithm_Cache<MessageAuthenticationCode> mac_cache;
+      Algorithm_Cache<BlockCipher>* block_cipher_cache;
+      Algorithm_Cache<StreamCipher>* stream_cipher_cache;
+      Algorithm_Cache<HashFunction>* hash_cache;
+      Algorithm_Cache<MessageAuthenticationCode>* mac_cache;
    };
 
 }