diff options
| -rw-r--r-- | checks/common.h | 3 | ||||
| -rw-r--r-- | checks/validate.cpp | 22 |
2 files changed, 11 insertions, 14 deletions
diff --git a/checks/common.h b/checks/common.h index 5b8f0a5d0..b849ce721 100644 --- a/checks/common.h +++ b/checks/common.h @@ -25,8 +25,7 @@ std::string hex_encode(const byte in[], u32bit len); Botan::SecureVector<byte> decode_hex(const std::string&); Botan::Filter* lookup(const std::string& algname, - const std::vector<std::string>& params, - const std::string& section); + const std::vector<std::string>& params); Botan::Filter* lookup_block(const std::string&, const std::string&); Botan::Filter* lookup_cipher(const std::string&, const std::string&, diff --git a/checks/validate.cpp b/checks/validate.cpp index 093d5e3b7..68035f293 100644 --- a/checks/validate.cpp +++ b/checks/validate.cpp @@ -54,18 +54,6 @@ u32bit random_word(Botan::RandomNumberGenerator& rng, #endif } -} - -Botan::Filter* lookup(const std::string&, const std::vector<std::string>&); - -bool failed_test(const std::string&, std::vector<std::string>, bool, bool, - std::string&, - Botan::RandomNumberGenerator& rng); - -std::vector<std::string> parse(const std::string&); -void strip(std::string&); -Botan::SecureVector<byte> decode_hex(const std::string&); - bool test_passhash(RandomNumberGenerator& rng) { #if defined(BOTAN_HAS_PASSHASH9) @@ -95,6 +83,16 @@ bool test_passhash(RandomNumberGenerator& rng) return true; } +} + +bool failed_test(const std::string&, std::vector<std::string>, bool, bool, + std::string&, + Botan::RandomNumberGenerator& rng); + +std::vector<std::string> parse(const std::string&); +void strip(std::string&); +Botan::SecureVector<byte> decode_hex(const std::string&); + u32bit do_validation_tests(const std::string& filename, RandomNumberGenerator& rng, bool should_pass) |