X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..6a7dce9165a4a707382e49877334353618fcad9a:/ec-bin.c

diff --git a/ec-bin.c b/ec-bin.c
index 30e19a9..8ba7354 100644
--- a/ec-bin.c
+++ b/ec-bin.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ec-bin.c,v 1.9 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Arithmetic for elliptic curves over binary fields
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -32,13 +32,7 @@
 #include <mLib/sub.h>
 
 #include "ec.h"
-
-/*----- Data structures ---------------------------------------------------*/
-
-typedef struct ecctx {
-  ec_curve c;
-  mp *bb;
-} ecctx;
+#include "ec-guts.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -67,7 +61,7 @@ static ec *ecfind(ec_curve *c, ec *d, mp *x)
 {
   field *f = c->f;
   mp *y, *u, *v;
-  
+
   if (F_ZEROP(f, x))
     y = F_SQRT(f, MP_NEW, c->b);
   else {
@@ -130,7 +124,7 @@ static ec *ecprojdbl(ec_curve *c, ec *d, const ec *a)
     EC_SETINF(d);
   else {
     field *f = c->f;
-    ecctx *cc = (ecctx *)c;
+    ecctx_bin *cc = (ecctx_bin *)c;
     mp *dx, *dy, *dz, *u, *v;
 
     dy = F_SQR(f, MP_NEW, a->z);	/* %$z^2$% */
@@ -186,7 +180,7 @@ static ec *ecadd(ec_curve *c, ec *d, const ec *a, const ec *b)
       dx = F_ADD(f, dx, dx, c->a);	/* %$a + \lambda^2 + \lambda$% */
       dx = F_ADD(f, dx, dx, a->x);    /* %$a + \lambda^2 + \lambda + x_0$% */
       dx = F_ADD(f, dx, dx, b->x);
-                           /* %$x' = a + \lambda^2 + \lambda + x_0 + x_1$% */
+			   /* %$x' = a + \lambda^2 + \lambda + x_0 + x_1$% */
     } else if (!MP_EQ(a->y, b->y) || F_ZEROP(f, a->x)) {
       EC_SETINF(d);
       return (d);
@@ -200,7 +194,7 @@ static ec *ecadd(ec_curve *c, ec *d, const ec *a, const ec *b)
       dx = F_ADD(f, dx, dx, c->a);    /* %$x' = a + \lambda^2 + \lambda$% */
       dy = MP_NEW;
     }
-      
+
     dy = F_ADD(f, dy, a->x, dx);	/* %$ x + x' $% */
     dy = F_MUL(f, dy, dy, lambda);	/* %$ (x + x') \lambda$% */
     dy = F_ADD(f, dy, dy, a->y);	/* %$ (x + x') \lambda + y$% */
@@ -317,7 +311,7 @@ static int ecprojcheck(ec_curve *c, const ec *p)
 {
   ec t = EC_INIT;
   int rc;
-  
+
   c->ops->fix(c, &t, p);
   rc = eccheck(c, &t);
   EC_DESTROY(&t);
@@ -326,7 +320,7 @@ static int ecprojcheck(ec_curve *c, const ec *p)
 
 static void ecdestroy(ec_curve *c)
 {
-  ecctx *cc = (ecctx *)c;
+  ecctx_bin *cc = (ecctx_bin *)c;
   MP_DROP(cc->c.a);
   MP_DROP(cc->c.b);
   if (cc->bb) MP_DROP(cc->bb);
@@ -347,7 +341,7 @@ static void ecdestroy(ec_curve *c)
 
 ec_curve *ec_bin(field *f, mp *a, mp *b)
 {
-  ecctx *cc = CREATE(ecctx);
+  ecctx_bin *cc = CREATE(ecctx_bin);
   cc->c.ops = &ec_binops;
   cc->c.f = f;
   cc->c.a = F_IN(f, MP_NEW, a);
@@ -358,29 +352,40 @@ ec_curve *ec_bin(field *f, mp *a, mp *b)
 
 ec_curve *ec_binproj(field *f, mp *a, mp *b)
 {
-  ecctx *cc = CREATE(ecctx);
+  ecctx_bin *cc = CREATE(ecctx_bin);
+  int i;
+  mp *c, *d;
+
   cc->c.ops = &ec_binprojops;
   cc->c.f = f;
   cc->c.a = F_IN(f, MP_NEW, a);
   cc->c.b = F_IN(f, MP_NEW, b);
-  cc->bb = F_SQRT(f, MP_NEW, cc->c.b);
-  if (cc->bb)
-    cc->bb = F_SQRT(f, cc->bb, cc->bb);
-  if (!cc->bb) {
+
+  c = MP_COPY(cc->c.b);
+  for (i = 0; i < f->nbits - 2; i++)
+    c = F_SQR(f, c, c);
+  d = F_SQR(f, MP_NEW, c); d = F_SQR(f, d, d);
+  if (!MP_EQ(d, cc->c.b)) {
+    MP_DROP(c);
+    MP_DROP(d);
     MP_DROP(cc->c.a);
     MP_DROP(cc->c.b);
     DESTROY(cc);
     return (0);
   }
+  cc->bb = c;
+  MP_DROP(d);
   return (&cc->c);
 }
 
 static const ec_ops ec_binops = {
+  "bin",
   ecdestroy, ec_stdsamep, ec_idin, ec_idout, ec_idfix,
   ecfind, ecneg, ecadd, ec_stdsub, ecdbl, eccheck
 };
 
 static const ec_ops ec_binprojops = {
+  "binproj",
   ecdestroy, ec_stdsamep, ec_projin, ec_projout, ec_projfix,
   ecfind, ecprojneg, ecprojadd, ec_stdsub, ecprojdbl, ecprojcheck
 };
@@ -412,7 +417,7 @@ int main(int argc, char *argv[])
   g.x = MP(0x0311103c17167564ace77ccb09c681f886ba54ee8);
   g.y = MP(0x333ac13c6447f2e67613bf7009daf98c87bb50c7f);
 
-  for (i = 0; i < n; i++) { 
+  for (i = 0; i < n; i++) {
     ec_mul(c, &d, &g, r);
     if (EC_ATINF(&d)) {
       fprintf(stderr, "zero too early\n");