Make ecc mod q test unconditional.

diff --git a/ChangeLog b/ChangeLog
index dcd2a7f2776d4fbf57dc2e475340c4b709de39a0..bb9401e6e0c7509a92e00b16574619e9ea9ff0f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-08-26  Niels Möller  <nisse@lysator.liu.se>
 
+       * testsuite/ecc-mod-test.c (test_curve): Make modq test
+       unconditional, partially reverting 2014-07-04 change.
+
        * ecc-25519.c (ecc_25519_modq): New function.
 
        * eccdata.c (output_curve): Precomputation for curve25519 mod q.

diff --git a/testsuite/ecc-mod-test.c b/testsuite/ecc-mod-test.c
index b2360e9b9e796791d95fc5eb0d5c864ddf2cbef7..c8af4a722b6a19fc4c1e04acb58a1decb9e3ade1 100644 (file)
--- a/testsuite/ecc-mod-test.c
+++ b/testsuite/ecc-mod-test.c
@@ -76,22 +76,19 @@ test_curve (gmp_randstate_t rands, const struct ecc_curve *ecc)
 
       ref_mod (ref, a, ecc->q, ecc->size);
 
-      if (ecc->modq)
-       {
-         mpn_copyi (m, a, 2*ecc->size);
-         ecc->modq (ecc, m);
-         if (mpn_cmp (m, ecc->q, ecc->size) >= 0)
-           mpn_sub_n (m, m, ecc->q, ecc->size);
+      mpn_copyi (m, a, 2*ecc->size);
+      ecc->modq (ecc, m);
+      if (mpn_cmp (m, ecc->q, ecc->size) >= 0)
+       mpn_sub_n (m, m, ecc->q, ecc->size);
 
-         if (mpn_cmp (m, ref, ecc->size))
-           {
-             fprintf (stderr, "ecc->modq failed: bit_size = %u\n",
-                      ecc->bit_size);
-             gmp_fprintf (stderr, "a   = %Nx\n", a, 2*ecc->size);
-             gmp_fprintf (stderr, "m   = %Nx (bad)\n", m, ecc->size);
-             gmp_fprintf (stderr, "ref = %Nx\n", ref, ecc->size);
-             abort ();
-           }
+      if (mpn_cmp (m, ref, ecc->size))
+       {
+         fprintf (stderr, "ecc->modq failed: bit_size = %u\n",
+                  ecc->bit_size);
+         gmp_fprintf (stderr, "a   = %Nx\n", a, 2*ecc->size);
+         gmp_fprintf (stderr, "m   = %Nx (bad)\n", m, ecc->size);
+         gmp_fprintf (stderr, "ref = %Nx\n", ref, ecc->size);
+         abort ();
        }
       if (ecc->Bmodq_size < ecc->size)
        {