From f1588d6d5c7c891f42164a36b9cab94c808855c6 Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 18 Jun 2008 15:01:51 +0000 Subject: Fix more -Wmissing-declaration warnings --- checks/block.cpp | 2 ++ checks/common.h | 17 +++++++++++++++++ checks/dolook.cpp | 11 +---------- checks/misc.cpp | 2 ++ 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 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 #include +#include +#include using Botan::byte; using Botan::u32bit; @@ -38,6 +40,21 @@ Botan::SecureVector decode_hex(const std::string&); Botan::u64bit get_clock(); Botan::u64bit get_ticks(); +Botan::Filter* lookup(const std::string& algname, + const std::vector& 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&); +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&); -Filter* lookup_kdf(const std::string&, const std::string&, - const std::string&); +#include "common.h" Filter* lookup(const std::string& algname, const std::vector& 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 using namespace Botan; +#include "common.h" + void strip_comments(std::string& line) { if(line.find('#') != std::string::npos) -- cgit v1.2.3