hashsum.1: Fix counting error (left over from some previous edit).

[u/mdw/catacomb] / ec.c

diff --git a/ec.c b/ec.c
index a84dd7a..cad7a56 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ec.c,v 1.10 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Elliptic curve definitions
  *
  * (c) 2001 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,
@@ -46,7 +46,8 @@
 
 int ec_samep(ec_curve *c, ec_curve *d)
 {
-  return (field_samep(c->f, d->f) && c->ops == d->ops && EC_SAMEP(c, d));
+  return (c == d || (field_samep(c->f, d->f) &&
+                    c->ops == d->ops && EC_SAMEP(c, d)));
 }
 
 /* --- @ec_create@ --- *
@@ -127,9 +128,7 @@ int ec_eq(const ec *p, const ec *q) { return (EC_EQ(p, q)); }
  */
 
 int ec_stdsamep(ec_curve *c, ec_curve *d)
-{
-  return (MP_EQ(c->a, d->a) && MP_EQ(c->b, d->b));
-}
+  { return (MP_EQ(c->a, d->a) && MP_EQ(c->b, d->b)); }
 
 /* --- @ec_idin@, @ec_idout@, @ec_idfix@ --- *
  *
@@ -171,10 +170,7 @@ ec *ec_idout(ec_curve *c, ec *d, const ec *p)
 }
 
 ec *ec_idfix(ec_curve *c, ec *d, const ec *p)
-{
-  EC_COPY(d, p);
-  return (d);
-}
+  { EC_COPY(d, p); return (d); }
 
 /* --- @ec_projin@, @ec_projout@, @ec_projfix@ --- *
  *
@@ -208,16 +204,21 @@ ec *ec_projout(ec_curve *c, ec *d, const ec *p)
   else {
     mp *x, *y, *z, *zz;
     field *f = c->f;
-    z = F_INV(f, MP_NEW, p->z);
-    zz = F_SQR(f, MP_NEW, z);
-    z = F_MUL(f, z, zz, z);
-    x = F_MUL(f, d->x, p->x, zz);
-    y = F_MUL(f, d->y, p->y, z);
-    mp_drop(z);
-    mp_drop(zz);
+    if (p->z == f->one) {
+      d->x = F_OUT(f, d->x, p->x);
+      d->y = F_OUT(f, d->y, p->y);
+    } else {
+      z = F_INV(f, MP_NEW, p->z);
+      zz = F_SQR(f, MP_NEW, z);
+      z = F_MUL(f, z, zz, z);
+      x = F_MUL(f, d->x, p->x, zz);
+      y = F_MUL(f, d->y, p->y, z);
+      mp_drop(z);
+      mp_drop(zz);
+      d->x = F_OUT(f, x, x);
+      d->y = F_OUT(f, y, y);
+    }
     mp_drop(d->z);
-    d->x = F_OUT(f, x, x);
-    d->y = F_OUT(f, y, y);
     d->z = 0;
   }
   return (d);
@@ -227,7 +228,7 @@ ec *ec_projfix(ec_curve *c, ec *d, const ec *p)
 {
   if (EC_ATINF(p))
     EC_SETINF(d);
-  else if (d->z == c->f->one)
+  else if (p->z == c->f->one)
     EC_COPY(d, p);
   else {
     mp *z, *zz;
@@ -315,11 +316,7 @@ ec *ec_find(ec_curve *c, ec *d, mp *x)
  */
 
 ec *ec_neg(ec_curve *c, ec *d, const ec *p)
-{
-  EC_IN(c, d, p);
-  EC_NEG(c, d, d);
-  return (EC_OUT(c, d, d));
-}
+  { EC_IN(c, d, p); EC_NEG(c, d, d); return (EC_OUT(c, d, d)); }
 
 /* --- @ec_add@ --- *
  *
@@ -379,11 +376,7 @@ ec *ec_sub(ec_curve *c, ec *d, const ec *p, const ec *q)
  */
 
 ec *ec_dbl(ec_curve *c, ec *d, const ec *p)
-{
-  EC_IN(c, d, p);
-  EC_DBL(c, d, d);
-  return (EC_OUT(c, d, d));
-}
+  { EC_IN(c, d, p); EC_DBL(c, d, d); return (EC_OUT(c, d, d)); }
 
 /* --- @ec_check@ --- *
  *
@@ -425,7 +418,7 @@ ec *ec_rand(ec_curve *c, ec *d, grand *r)
   do x = F_RAND(c->f, x, r); while (!EC_FIND(c, d, x));
   mp_drop(x);
   if (grand_range(r, 2)) EC_NEG(c, d, d);
-  return (EC_OUT(c, d, d));    
+  return (EC_OUT(c, d, d));
 }
 
 /*----- That's all, folks -------------------------------------------------*/