Make elliptic curve stuff build.

[u/mdw/catacomb] / f-prime.c

diff --git a/f-prime.c b/f-prime.c
index a9673b8..f4bf3a7 100644 (file)
--- a/f-prime.c
+++ b/f-prime.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: f-prime.c,v 1.2 2002/01/13 13:48:44 mdw Exp $
+ * $Id: f-prime.c,v 1.3 2003/05/15 23:25:59 mdw Exp $
  *
  * Prime fields with Montgomery arithmetic
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: f-prime.c,v $
+ * Revision 1.3  2003/05/15 23:25:59  mdw
+ * Make elliptic curve stuff build.
+ *
  * Revision 1.2  2002/01/13 13:48:44  mdw
  * Further progress.
  *
@@ -107,7 +110,7 @@ static mp *fsqr(field *ff, mp *d, mp *x)
 static mp *finv(field *ff, mp *d, mp *x)
 {
   fctx *f = (fctx *)ff;
-  d = mpmont_reduce(&f->mm, x);
+  d = mpmont_reduce(&f->mm, d, x);
   mp_gcd(0, 0, &d, f->mm.m, d);
   return (mpmont_mul(&f->mm, d, d, f->mm.r2));
 }
@@ -121,13 +124,13 @@ static mp *freduce(field *ff, mp *d, mp *x)
 
 static mp *fdbl(field *ff, mp *d, mp *x)
 {
-  fctx *f = (fctx *)ff;
+/*   fctx *f = (fctx *)ff; */
   return (mp_lsl(d, x, 1));
 }
 
 static mp *ftpl(field *ff, mp *d, mp *x)
 {
-  fctx *f = (fctx *)ff;
+/*   fctx *f = (fctx *)ff; */
   MP_DEST(d, MP_LEN(x) + 1, x->f);
   MPX_UMULN(d->v, d->vl, x->v, x->vl, 3);
   return (d);
@@ -136,7 +139,7 @@ static mp *ftpl(field *ff, mp *d, mp *x)
 static mp *fsqrt(field *ff, mp *d, mp *x)
 {
   fctx *f = (fctx *)ff;
-  d = mpmont_reduce(&f->mm, x);
+  d = mpmont_reduce(&f->mm, d, x);
   d = mp_modsqrt(d, d, f->mm.m);
   return (mpmont_mul(&f->mm, d, d, f->mm.r2));
 }
@@ -162,11 +165,11 @@ static field_ops fops = {
 
 field *field_prime(mp *p)
 {
-  ftcx *f = CREATE(fctx);
+  fctx *f = CREATE(fctx);
   f->f.ops = &fops;
   mpmont_create(&f->mm, p);
-  f->zero = MP_ZERO;
-  f->one = &f->mm.r;
+  f->f.zero = MP_ZERO;
+  f->f.one = f->mm.r;
   return (&f->f);
 }