aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-06-18 15:01:51 +0000
committerlloyd <[email protected]>2008-06-18 15:01:51 +0000
commitf1588d6d5c7c891f42164a36b9cab94c808855c6 (patch)
treefcb0e925d2147987342cc8b1c58e424a78387d8a
parentcbf406bce0ec8bb937e0ec6062d94ad709bf8794 (diff)
Fix more -Wmissing-declaration warnings
-rw-r--r--checks/block.cpp2
-rw-r--r--checks/common.h17
-rw-r--r--checks/dolook.cpp11
-rw-r--r--checks/misc.cpp2
4 files changed, 22 insertions, 10 deletions
diff --git a/checks/block.cpp b/checks/block.cpp
index ac003dc25..b9613e542 100644
--- a/checks/block.cpp
+++ b/checks/block.cpp
@@ -13,6 +13,8 @@
#include <botan/lookup.h>
using namespace Botan;
+#include "common.h"
+
class ECB_Encryption_ErrorCheck : public Filter
{
public:
diff --git a/checks/common.h b/checks/common.h
index c2f48a575..e42fa8e44 100644
--- a/checks/common.h
+++ b/checks/common.h
@@ -9,6 +9,8 @@
#include <stdexcept>
#include <botan/secmem.h>
+#include <botan/filter.h>
+#include <botan/rng.h>
using Botan::byte;
using Botan::u32bit;
@@ -38,6 +40,21 @@ Botan::SecureVector<byte> decode_hex(const std::string&);
Botan::u64bit get_clock();
Botan::u64bit get_ticks();
+Botan::Filter* lookup(const std::string& algname,
+ const std::vector<std::string>& params,
+ const std::string& section);
+
+Botan::Filter* lookup_block(const std::string&, const std::string&);
+Botan::Filter* lookup_cipher(const std::string&, const std::string&,
+ const std::string&, bool);
+Botan::Filter* lookup_hash(const std::string&);
+Botan::Filter* lookup_mac(const std::string&, const std::string&);
+Botan::Filter* lookup_rng(const std::string&, const std::string&);
+Botan::Filter* lookup_encoder(const std::string&);
+Botan::Filter* lookup_s2k(const std::string&, const std::vector<std::string>&);
+Botan::Filter* lookup_kdf(const std::string&, const std::string&,
+ const std::string&);
+
class Fixed_Output_RNG : public Botan::RandomNumberGenerator
{
public:
diff --git a/checks/dolook.cpp b/checks/dolook.cpp
index 3767dac8f..854c770b7 100644
--- a/checks/dolook.cpp
+++ b/checks/dolook.cpp
@@ -18,16 +18,7 @@
using namespace Botan;
-Filter* lookup_block(const std::string&, const std::string&);
-Filter* lookup_cipher(const std::string&, const std::string&,
- const std::string&, bool);
-Filter* lookup_hash(const std::string&);
-Filter* lookup_mac(const std::string&, const std::string&);
-Filter* lookup_rng(const std::string&, const std::string&);
-Filter* lookup_encoder(const std::string&);
-Filter* lookup_s2k(const std::string&, const std::vector<std::string>&);
-Filter* lookup_kdf(const std::string&, const std::string&,
- const std::string&);
+#include "common.h"
Filter* lookup(const std::string& algname,
const std::vector<std::string>& params,
diff --git a/checks/misc.cpp b/checks/misc.cpp
index 53da2a77e..82b207196 100644
--- a/checks/misc.cpp
+++ b/checks/misc.cpp
@@ -6,6 +6,8 @@
#include <botan/hex.h>
using namespace Botan;
+#include "common.h"
+
void strip_comments(std::string& line)
{
if(line.find('#') != std::string::npos)