diff options
Diffstat (limited to 'checks/validate.cpp')
| -rw-r--r-- | checks/validate.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/checks/validate.cpp b/checks/validate.cpp index 68035f293..e1d5117a5 100644 --- a/checks/validate.cpp +++ b/checks/validate.cpp @@ -71,12 +71,17 @@ bool test_passhash(RandomNumberGenerator& rng) std::cout << "." << std::flush; - std::string gen_hash = generate_passhash9(input, rng, 5); + for(byte alg_id = 0; alg_id <= 2; ++alg_id) + { + std::string gen_hash = generate_passhash9(input, alg_id, rng, 1); - if(!check_passhash9(input, gen_hash)) - return false; + if(!check_passhash9(input, gen_hash)) + return false; + + std::cout << "." << std::flush; + } - std::cout << "." << std::endl;; + std::cout << std::endl; #endif @@ -91,7 +96,6 @@ bool failed_test(const std::string&, std::vector<std::string>, bool, bool, 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, @@ -295,7 +299,7 @@ bool failed_test(const std::string& algo, pipe.append(test); pipe.append(new Botan::Hex_Encoder); - Botan::SecureVector<byte> data = decode_hex(in); + Botan::SecureVector<byte> data = Botan::hex_decode(in); const byte* data_ptr = data; // this can help catch errors with buffering, etc |