From fb2c801df91d09e6736835edfa8585579aacf7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 29 Aug 2014 21:45:01 +0200
Subject: [PATCH] Make more of the testsuite use ecc->h_to_a.
---
ChangeLog | 6 +++++-
testsuite/ecc-mul-a-test.c | 2 +-
testsuite/ecc-mul-g-test.c | 2 +-
testsuite/testutils.c | 4 ++--
testsuite/testutils.h | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ccf7009c..0f4b63bb 100644
--- 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 54421704..97cb4cda 100644
--- 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 2f5a9e79..a02b218c 100644
--- 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 33c3c40e..42187931 100644
--- 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 b2b77b16..b7a7d039 100644
--- 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 */
--
GitLab