aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-18 23:44:52 +0000
committerlloyd <[email protected]>2014-01-18 23:44:52 +0000
commitf8ff9cf9ec97a63d6947d80209fa72cff23cadf6 (patch)
tree29b456a506fe7a1a2160a1439a080e33d9ad09b9 /src/lib
parent2f6e209b41f6c9b403e94028f7026866880f3ce1 (diff)
Fix algo factory compile
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/algo_factory/algo_factory.h4
-rw-r--r--src/lib/kdf/kdf.cpp2
-rw-r--r--src/lib/libstate/entropy_srcs.cpp (renamed from src/lib/libstate/global_rng.cpp)0
-rw-r--r--src/lib/pubkey/pubkey.cpp1
-rw-r--r--src/lib/tls/tls_handshake_state.cpp1
-rw-r--r--src/lib/tls/tls_session_key.cpp1
6 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/algo_factory/algo_factory.h b/src/lib/algo_factory/algo_factory.h
index 61f939cd9..40d1be5ad 100644
--- a/src/lib/algo_factory/algo_factory.h
+++ b/src/lib/algo_factory/algo_factory.h
@@ -205,10 +205,6 @@ class BOTAN_DLL Algorithm_Factory
friend class Engine_Iterator;
private:
- Algorithm_Factory(const Algorithm_Factory&) {}
- Algorithm_Factory& operator=(const Algorithm_Factory&)
- { return (*this); }
-
Engine* get_engine_n(size_t n) const;
std::vector<Engine*> engines;
diff --git a/src/lib/kdf/kdf.cpp b/src/lib/kdf/kdf.cpp
index 84a0cdd15..39ef9db13 100644
--- a/src/lib/kdf/kdf.cpp
+++ b/src/lib/kdf/kdf.cpp
@@ -5,7 +5,7 @@
* Distributed under the terms of the Botan license
*/
-#include <botan/lookup.h>
+#include <botan/kdf.h>
#include <botan/libstate.h>
#include <botan/scan_name.h>
diff --git a/src/lib/libstate/global_rng.cpp b/src/lib/libstate/entropy_srcs.cpp
index b6dc6b559..b6dc6b559 100644
--- a/src/lib/libstate/global_rng.cpp
+++ b/src/lib/libstate/entropy_srcs.cpp
diff --git a/src/lib/pubkey/pubkey.cpp b/src/lib/pubkey/pubkey.cpp
index 2a0acb6ac..a2c5cb745 100644
--- a/src/lib/pubkey/pubkey.cpp
+++ b/src/lib/pubkey/pubkey.cpp
@@ -12,7 +12,6 @@
#include <botan/parsing.h>
#include <botan/libstate.h>
#include <botan/engine.h>
-#include <botan/lookup.h>
#include <botan/internal/bit_ops.h>
namespace Botan {
diff --git a/src/lib/tls/tls_handshake_state.cpp b/src/lib/tls/tls_handshake_state.cpp
index 84b22cc09..a7317a333 100644
--- a/src/lib/tls/tls_handshake_state.cpp
+++ b/src/lib/tls/tls_handshake_state.cpp
@@ -8,7 +8,6 @@
#include <botan/internal/tls_handshake_state.h>
#include <botan/internal/tls_messages.h>
#include <botan/internal/tls_record.h>
-#include <botan/lookup.h>
namespace Botan {
diff --git a/src/lib/tls/tls_session_key.cpp b/src/lib/tls/tls_session_key.cpp
index c13bc5af3..8bf0c94c1 100644
--- a/src/lib/tls/tls_session_key.cpp
+++ b/src/lib/tls/tls_session_key.cpp
@@ -8,7 +8,6 @@
#include <botan/internal/tls_session_key.h>
#include <botan/internal/tls_handshake_state.h>
#include <botan/internal/tls_messages.h>
-#include <botan/lookup.h>
namespace Botan {