Make more of the testsuite use ecc->h_to_a.

diff --git a/ChangeLog b/ChangeLog
index ccf7009c2c8ea6a3522acd51670a9ac6c27b80b2..0f4b63bb4905268738cc23a068c7f8431d258124 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2014-08-29  Niels Möller  <nisse@lysator.liu.se>
 
-       * examples/ecc-benchmark.c (bench_add_jjj): Renamed, to...
+       * testsuite/testutils.c (test_ecc_mul_j): Renamed, to ...
+       (test_ecc_mul_h): ... new name. Use ecc->h_to_a function pointer.
+       Updated callers.
+
+       * examples/ecc-benchmark.c (bench_add_jjj): Renamed, to ...
        (bench_add_hhh): ... new name. Use ecc->add_hhh function pointer.
        (bench_add_ehh): Deleted.
        (bench_curve): Use bench_add_hhh for all curves. Use ecc->mul_itch

diff --git a/testsuite/ecc-mul-a-test.c b/testsuite/ecc-mul-a-test.c
index 54421704e31d8c27a0cf2c81da577b3100cb6d43..97cb4cda144675dfc741ca96bcfb31ac113370f0 100644 (file)
--- a/testsuite/ecc-mul-a-test.c
+++ b/testsuite/ecc-mul-a-test.c
@@ -40,7 +40,7 @@ test_main (void)
       for (n[0] = 2; n[0] <= 4; n[0]++)
        {
          ecc_mul_a (ecc, p, n, ecc->g, scratch);
-         test_ecc_mul_j (i, n[0], p);
+         test_ecc_mul_h (i, n[0], p);
        }
 
       /* (order - 1) * g = - g */

diff --git a/testsuite/ecc-mul-g-test.c b/testsuite/ecc-mul-g-test.c
index 2f5a9e79d042720ae98f0726726b16a0e617bb5f..a02b218c1363b65188a06952d5767db3667035b8 100644 (file)
--- a/testsuite/ecc-mul-g-test.c
+++ b/testsuite/ecc-mul-g-test.c
@@ -42,7 +42,7 @@ test_main (void)
       for (n[0] = 2; n[0] <= 4; n[0]++)
        {
          ecc_mul_g (ecc, p, n, scratch);
-         test_ecc_mul_j (i, n[0], p);
+         test_ecc_mul_h (i, n[0], p);
        }
 
       /* (order - 1) * g = - g */

diff --git a/testsuite/testutils.c b/testsuite/testutils.c
index 33c3c40e266d0de80c645cd63f1b71b3fd0d0ace..421879311b16d1f6ce9890c0b173197f4e9247c7 100644 (file)
--- a/testsuite/testutils.c
+++ b/testsuite/testutils.c
@@ -1371,12 +1371,12 @@ test_ecc_mul_a (unsigned curve, unsigned n, const mp_limb_t *p)
 }
 
 void
-test_ecc_mul_j (unsigned curve, unsigned n, const mp_limb_t *p)
+test_ecc_mul_h (unsigned curve, unsigned n, const mp_limb_t *p)
 {
   const struct ecc_curve *ecc = ecc_curves[curve];
   mp_limb_t *np = xalloc_limbs (ecc_size_a (ecc));
   mp_limb_t *scratch = xalloc_limbs (ecc_j_to_a_itch(ecc));
-  ecc_j_to_a (ecc, 0, np, p, scratch);
+  ecc->h_to_a (ecc, 0, np, p, scratch);
 
   test_ecc_mul_a (curve, n, np);
 

diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index b2b77b165f6532518d96021f489bb2f1c0199bee..b7a7d0396ae3027463b2625f34078a4ee4be50a9 100644 (file)
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -239,7 +239,7 @@ void
 test_ecc_mul_a (unsigned curve, unsigned n, const mp_limb_t *p);
 
 void
-test_ecc_mul_j (unsigned curve, unsigned n, const mp_limb_t *p);
+test_ecc_mul_h (unsigned curve, unsigned n, const mp_limb_t *p);
 
 #endif /* WITH_HOGWEED */