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

diff --git a/ec.c b/ec.c
index 4111928..a84dd7a 100644
--- a/ec.c
+++ b/ec.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ec.c,v 1.4.4.1 2003/06/10 13:43:53 mdw Exp $
+ * $Id: ec.c,v 1.10 2004/04/08 01:36:15 mdw Exp $
  *
  * Elliptic curve definitions
  *
@@ -27,34 +27,28 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: ec.c,v $
- * Revision 1.4.4.1  2003/06/10 13:43:53  mdw
- * Simple (non-projective) curves over prime fields now seem to work.
- *
- * Revision 1.4  2003/05/15 23:25:59  mdw
- * Make elliptic curve stuff build.
- *
- * Revision 1.3  2002/01/13 13:48:44  mdw
- * Further progress.
- *
- * Revision 1.2  2001/05/07 17:29:44  mdw
- * Treat projective coordinates as an internal representation.  Various
- * minor interface changes.
- *
- * Revision 1.1  2001/04/29 18:12:33  mdw
- * Prototype version.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "ec.h"
-#include "ec-exp.h"
 
 /*----- Trivial wrappers --------------------------------------------------*/
 
+/* --- @ec_samep@ --- *
+ *
+ * Arguments:	@ec_curve *c, *d@ = two elliptic curves
+ *
+ * Returns:	Nonzero if the curves are identical (not just isomorphic).
+ *
+ * Use:		Checks for sameness of curves.  This function does the full
+ *		check, not just the curve-type-specific check done by the
+ *		@sampep@ field operation.
+ */
+
+int ec_samep(ec_curve *c, ec_curve *d)
+{
+  return (field_samep(c->f, d->f) && c->ops == d->ops && EC_SAMEP(c, d));
+}
+
 /* --- @ec_create@ --- *
  *
  * Arguments:	@ec *p@ = pointer to an elliptic-curve point
@@ -111,9 +105,33 @@ ec *ec_setinf(ec *p) { EC_SETINF(p); return (p); }
 
 ec *ec_copy(ec *d, const ec *p) { EC_COPY(d, p); return (d); }
 
+/* --- @ec_eq@ --- *
+ *
+ * Arguments:	@const ec *p, *q@ = two points
+ *
+ * Returns:	Nonzero if the points are equal.  Compares external-format
+ *		points.
+ */
+
+int ec_eq(const ec *p, const ec *q) { return (EC_EQ(p, q)); }
+
 /*----- Standard curve operations -----------------------------------------*/
 
-/* --- @ec_idin@, @ec_idout@ --- *
+/* --- @ec_stdsamep@ --- *
+ *
+ * Arguments:	@ec_curve *c, *d@ = two elliptic curves
+ *
+ * Returns:	Nonzero if the curves are identical (not just isomorphic).
+ *
+ * Use:		Simple sameness check on @a@ and @b@ curve members.
+ */
+
+int ec_stdsamep(ec_curve *c, ec_curve *d)
+{
+  return (MP_EQ(c->a, d->a) && MP_EQ(c->b, d->b));
+}
+
+/* --- @ec_idin@, @ec_idout@, @ec_idfix@ --- *
  *
  * Arguments:	@ec_curve *c@ = pointer to an elliptic curve
  *		@ec *d@ = pointer to the destination
@@ -152,7 +170,13 @@ ec *ec_idout(ec_curve *c, ec *d, const ec *p)
   return (d);
 }
 
-/* --- @ec_projin@, @ec_projout@ --- *
+ec *ec_idfix(ec_curve *c, ec *d, const ec *p)
+{
+  EC_COPY(d, p);
+  return (d);
+}
+
+/* --- @ec_projin@, @ec_projout@, @ec_projfix@ --- *
  *
  * Arguments:	@ec_curve *c@ = pointer to an elliptic curve
  *		@ec *d@ = pointer to the destination
@@ -182,12 +206,15 @@ ec *ec_projout(ec_curve *c, ec *d, const ec *p)
   if (EC_ATINF(p))
     EC_SETINF(d);
   else {
-    mp *x, *y, *z;
+    mp *x, *y, *z, *zz;
     field *f = c->f;
     z = F_INV(f, MP_NEW, p->z);
-    x = F_MUL(f, d->x, p->x, 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);
     mp_drop(d->z);
     d->x = F_OUT(f, x, x);
     d->y = F_OUT(f, y, y);
@@ -196,6 +223,28 @@ ec *ec_projout(ec_curve *c, ec *d, const ec *p)
   return (d);
 }
 
+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)
+    EC_COPY(d, p);
+  else {
+    mp *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);
+    d->x = F_MUL(f, d->x, p->x, zz);
+    d->y = F_MUL(f, d->y, p->y, z);
+    mp_drop(z);
+    mp_drop(zz);
+    mp_drop(d->z);
+    d->z = MP_COPY(f->one);
+  }
+  return (d);
+}
+
 /* --- @ec_stdsub@ --- *
  *
  * Arguments:	@ec_curve *c@ = pointer to an elliptic curve
@@ -213,6 +262,7 @@ ec *ec_stdsub(ec_curve *c, ec *d, const ec *p, const ec *q)
 {
   ec t = EC_INIT;
   EC_NEG(c, &t, q);
+  EC_FIX(c, &t, &t);
   EC_ADD(c, d, p, &t);
   EC_DESTROY(&t);
   return (d);
@@ -249,7 +299,7 @@ ec *ec_find(ec_curve *c, ec *d, mp *x)
   x = F_IN(c->f, MP_NEW, x);
   if ((d = EC_FIND(c, d, x)) != 0)
     EC_OUT(c, d, d);
-  mp_drop(x);
+  MP_DROP(x);
   return (d);
 }
 
@@ -307,10 +357,10 @@ ec *ec_add(ec_curve *c, ec *d, const ec *p, const ec *q)
 
 ec *ec_sub(ec_curve *c, ec *d, const ec *p, const ec *q)
 {
-  ec pp, qq;
+  ec pp = EC_INIT, qq = EC_INIT;
   EC_IN(c, &pp, p);
   EC_IN(c, &qq, q);
-  EC_SUB(c, d, &qq, &qq);
+  EC_SUB(c, d, &pp, &qq);
   EC_OUT(c, d, d);
   EC_DESTROY(&pp);
   EC_DESTROY(&qq);
@@ -335,44 +385,47 @@ ec *ec_dbl(ec_curve *c, ec *d, const ec *p)
   return (EC_OUT(c, d, d));
 }
 
-/* --- @ec_imul@, @ec_mul@ --- *
+/* --- @ec_check@ --- *
  *
  * Arguments:	@ec_curve *c@ = pointer to an elliptic curve
- *		@ec *d@ = pointer to the destination point
- *		@const ec *p@ = pointer to the generator point
- *		@mp *n@ = integer multiplier
+ *		@const ec *p@ = pointer to the point
  *
- * Returns:	The destination @d@.
+ * Returns:	Zero if OK, nonzero if this is an invalid point.
  *
- * Use:		Multiplies a point by a scalar, returning %$n p$%.  The
- *		@imul@ variant uses internal representations for argument
- *		and result.
+ * Use:		Checks that a point is actually on an elliptic curve.
  */
 
-ec *ec_imul(ec_curve *c, ec *d, const ec *p, mp *n)
+int ec_check(ec_curve *c, const ec *p)
 {
   ec t = EC_INIT;
+  int rc;
 
-  EC_COPY(&t, p);
-  if (t.x && (n->f & MP_BURN))
-    t.x->f |= MP_BURN;
-  MP_SHRINK(n);
-  EC_SETINF(d);
-  if (MP_LEN(n) == 0)
-    ;
-  else if (MP_LEN(n) < EXP_THRESH)
-    EXP_SIMPLE(*d, t, n);
-  else
-    EXP_WINDOW(*d, t, n);
+  if (EC_ATINF(p))
+    return (0);
+  EC_IN(c, &t, p);
+  rc = EC_CHECK(c, &t);
   EC_DESTROY(&t);
-  return (d);
+  return (rc);
 }
 
-ec *ec_mul(ec_curve *c, ec *d, const ec *p, mp *n)
+/* --- @ec_rand@ --- *
+ *
+ * Arguments:	@ec_curve *c@ = pointer to an elliptic curve
+ *		@ec *d@ = pointer to the destination point
+ *		@grand *r@ = random number source
+ *
+ * Returns:	The destination @d@.
+ *
+ * Use:		Finds a random point on the given curve.
+ */
+
+ec *ec_rand(ec_curve *c, ec *d, grand *r)
 {
-  EC_IN(c, d, p);
-  ec_imul(c, d, d, n);
-  return (EC_OUT(c, d, d));
+  mp *x = MP_NEW;
+  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));    
 }
 
 /*----- That's all, folks -------------------------------------------------*/