ecc_ecdsa_verify: Use struct ecc_curve function pointers.

diff --git a/ChangeLog b/ChangeLog
index 6d7237f9bb2deed97ad08c699c1338f0c731b3bc..4e8ece3e3b6f575b52b9c36320d1cfd4bff630cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
 2014-08-28  Niels Möller  <nisse@lysator.liu.se>
 
+       * ecc-ecdsa-verify.c (ecc_ecdsa_verify): Use the struct ecc_curve
+       function pointers: mul, mul_g, add_hhh, h_to_a.
+
        * ecc-internal.h (ECC_ECDSA_VERIFY_ITCH): Deleted macro. Needed
        scratch depends on curve type, not just size.
+       (ecc_add_func): New typedef.
+       (struct ecc_curve): New function pointer add_hhh, and constant
+       add_hhh_itch. Updated all instances.
+
        * ecdsa-verify.c (ecdsa_verify): Use the ecc_ecdsa_verify_itch
        function, not the corresponding macro.
        * ecc-ecdsa-verify.c (ecc_ecdsa_verify_itch): Take ecc->mul_itch

diff --git a/ecc-ecdsa-verify.c b/ecc-ecdsa-verify.c
index cc7e0aeff417bb3ee9be0756d07cdb5ba5b5964f..edd6600a5fbb11c39ad04676c295b3c151a50c84 100644 (file)
--- a/ecc-ecdsa-verify.c
+++ b/ecc-ecdsa-verify.c
@@ -1,6 +1,6 @@
 /* ecc-ecdsa-verify.c
 
-   Copyright (C) 2013 Niels Möller
+   Copyright (C) 2013, 2014 Niels Möller
 
    This file is part of GNU Nettle.
 
@@ -113,7 +113,7 @@ ecc_ecdsa_verify (const struct ecc_curve *ecc,
   ecc_modq_mul (ecc, u2, rp, sinv);
 
    /* Total storage: 5*ecc->size + ecc->mul_itch */
-  ecc_mul_a (ecc, P2, u2, pp, u2 + ecc->size);
+  ecc->mul (ecc, P2, u2, pp, u2 + ecc->size);
 
   /* u1 = h / s, P1 = u1 * G */
   ecc_hash (ecc, hp, length, digest);
@@ -124,7 +124,7 @@ ecc_ecdsa_verify (const struct ecc_curve *ecc,
   if (!zero_p (u1, ecc->size))
     {
       /* Total storage: 6*ecc->size + ecc->mul_g_itch (ecc->size) */
-      ecc_mul_g (ecc, P1, u1, u1 + ecc->size);
+      ecc->mul_g (ecc, P1, u1, u1 + ecc->size);
 
       /* NOTE: ecc_add_jjj and/or ecc_j_to_a will produce garbage in
         case u1 G = +/- u2 V. However, anyone who gets his or her
@@ -140,11 +140,11 @@ ecc_ecdsa_verify (const struct ecc_curve *ecc,
         s_1 = z. Hitting that is about as unlikely as finding the
         private key by guessing.
        */
-      /* Total storage: 6*ecc->size + ECC_ADD_JJJ_ITCH (ecc->size) */
-      ecc_add_jjj (ecc, P1, P1, P2, u1);
+      /* Total storage: 6*ecc->size + ecc->add_hhh_itch */
+      ecc->add_hhh (ecc, P1, P1, P2, u1);
     }
   /* x coordinate only, modulo q */
-  ecc_j_to_a (ecc, 2, P2, P1, u1);
+  ecc->h_to_a (ecc, 2, P2, P1, u1);
 
   return (mpn_cmp (rp, P2, ecc->size) == 0);
 #undef P2