From: Niels Möller <nisse@lysator.liu.se>
Date: Tue, 26 Aug 2014 17:21:23 +0000 (+0200)
Subject: Make ecc mod q test unconditional.
X-Git-Tag: nettle_3.1rc1~155^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c87a5aaf2bec54bdb765e8861f79497385e2c29;p=thirdparty%2Fnettle.git

Make ecc mod q test unconditional.
---

diff --git a/ChangeLog b/ChangeLog
index dcd2a7f2..bb9401e6 100644
--- 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 b2360e9b..c8af4a72 100644
--- 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)
 	{