1 files changed, 23 insertions, 76 deletions
diff --git a/src/tests/test_rfc6979.cpp b/src/tests/test_rfc6979.cpp
index 772a492c3..59d44f5b9 100644
--- a/src/tests/test_rfc6979.cpp
+++ b/src/tests/test_rfc6979.cpp
@@ -11,95 +11,42 @@
   #include <botan/hex.h>
 #endif
 
-#include <iostream>
+namespace Botan_Tests {
 
 namespace {
 
-size_t rfc6979_testcase(const std::string& q_str,
-                        const std::string& x_str,
-                        const std::string& h_str,
-                        const std::string& exp_k_str,
-                        const std::string& hash,
-                        size_t testcase)
-   {
-   size_t fails = 0;
-
 #if defined(BOTAN_HAS_RFC6979_GENERATOR)
 
-   using namespace Botan;
-
-   const BigInt q(q_str);
-   const BigInt x(x_str);
-   const BigInt h(h_str);
-   const BigInt exp_k(exp_k_str);
+class RFC6979_KAT_Tests : public Text_Based_Test
+   {
+   public:
+      RFC6979_KAT_Tests() : Text_Based_Test(Test::data_file("rfc6979.vec"),
+                                            {"Q", "X", "H", "K"}) {}
 
-   const BigInt gen_k = generate_rfc6979_nonce(x, q, h, hash);
+      Test::Result run_one_test(const std::string& hash, const VarMap& vars)
+         {
+         const BigInt Q = get_req_bn(vars, "Q");
+         const BigInt X = get_req_bn(vars, "X");
+         const BigInt H = get_req_bn(vars, "H");
+         const BigInt K = get_req_bn(vars, "K");
 
-   if(gen_k != exp_k)
-      {
-      std::cout << "RFC 6979 test #" << testcase << " failed; generated k="
-                << std::hex << gen_k << std::endl;
-      ++fails;
-      }
+         Test::Result result("RFC 6979 nonce generation");
+         result.test_eq("vector matches", Botan::generate_rfc6979_nonce(X, Q, H, hash), K);
 
-   RFC6979_Nonce_Generator gen(hash, q, x);
+         Botan::RFC6979_Nonce_Generator gen(hash, Q, X);
 
-   const BigInt gen_0 = gen.nonce_for(h);
-   if(gen_0 != exp_k)
-      {
-      std::cout << "RFC 6979 test #" << testcase << " failed; generated k="
-                << std::hex << gen_0 << " (gen_0)" << std::endl;
-      ++fails;
-      }
+         result.test_eq("vector matches", gen.nonce_for(H), K);
+         result.test_ne("vector matches", gen.nonce_for(H+1), K);
+         result.test_eq("vector matches", gen.nonce_for(H), K);
 
-   const BigInt gen_1 = gen.nonce_for(h+1);
-   if(gen_1 == exp_k)
-      {
-      std::cout << "RFC 6979 test #" << testcase << " failed; generated k="
-                << std::hex << gen_1 << " (gen_1)" << std::endl;
-      ++fails;
-      }
+         return result;
+         }
+   };
 
-   const BigInt gen_2 = gen.nonce_for(h);
-   if(gen_2 != exp_k)
-      {
-      std::cout << "RFC 6979 test #" << testcase << " failed; generated k="
-                << std::hex << gen_2 << " (gen_2)" << std::endl;
-      ++fails;
-      }
+BOTAN_REGISTER_TEST("rfc6979", RFC6979_KAT_Tests);
 
 #endif
 
-   return fails;
-   }
-
 }
 
-size_t test_rfc6979()
-   {
-   using namespace Botan;
-
-   size_t fails = 0;
-
-#if defined(BOTAN_HAS_RFC6979_GENERATOR)
-
-   // From RFC 6979 A.1.1
-   fails += rfc6979_testcase("0x4000000000000000000020108A2E0CC0D99F8A5EF",
-                             "0x09A4D6792295A7F730FC3F2B49CBC0F62E862272F",
-                             "0x01795EDF0D54DB760F156D0DAC04C0322B3A204224",
-                             "0x23AF4074C90A02B3FE61D286D5C87F425E6BDD81B",
-                             "SHA-256", 1);
-
-   // DSA 1024 bits test #1
-   fails += rfc6979_testcase("0x996F967F6C8E388D9E28D01E205FBA957A5698B1",
-                             "0x411602CB19A6CCC34494D79D98EF1E7ED5AF25F7",
-                             "0x8151325DCDBAE9E0FF95F9F9658432DBEDFDB209",
-                             "0x7BDB6B0FF756E1BB5D53583EF979082F9AD5BD5B",
-                             "SHA-1", 2);
-
-#endif
-
-   test_report("RFC 6979", 2, fails);
-
-   return fails;
-   }
+}