Add some secp256k1 KATs and a randomized ECC test suggested in

http://crypto.stackexchange.com/questions/784

1 files changed, 48 insertions, 0 deletions

diff --git a/src/tests/test_ecdsa.cpp b/src/tests/test_ecdsa.cpp
index f9e83f117..9b256bf9c 100644
--- a/src/tests/test_ecdsa.cpp
+++ b/src/tests/test_ecdsa.cpp
@@ -34,9 +34,57 @@ size_t ecdsa_sig_kat(const std::string& group_id,
    return validate_signature(verify, sign, "DSA/" + hash, msg, rng, nonce, signature);
    }
 
+size_t ecc_point_mul(const std::string& group_id,
+                     const std::string& m_s,
+                     const std::string& X_s,
+                     const std::string& Y_s)
+   {
+   EC_Group group(OIDS::lookup(group_id));
+
+   const BigInt m(m_s);
+   const BigInt X(X_s);
+   const BigInt Y(Y_s);
+
+   PointGFp p = group.get_base_point() * m;
+
+   size_t fails = 0;
+
+   if(p.get_affine_x() != X)
+      {
+      std::cout << p.get_affine_x() << " != " << X << "\n";
+      ++fails;
+      }
+
+   if(p.get_affine_y() != Y)
+      {
+      std::cout << p.get_affine_y() << " != " << Y << "\n";
+      ++fails;
+      }
+
+   return fails;
+   }
+
 }
+
 #endif
 
+size_t test_ecc_pointmul()
+   {
+   size_t fails = 0;
+
+#if defined(BOTAN_HAS_ECC_GROUP)
+   std::ifstream ecc_mul(PK_TEST_DATA_DIR "/ecc.vec");
+
+   fails += run_tests_bb(ecc_mul, "ECC Point Mult", "Y", false,
+             [](std::map<std::string, std::string> m) -> size_t
+             {
+             return ecc_point_mul(m["Group"], m["m"], m["X"], m["Y"]);
+             });
+#endif
+
+   return fails;
+   }
+
 size_t test_ecdsa()
    {
    size_t fails = 0;