Elliptic curves on binary fields work.

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

diff --git a/f-prime.c b/f-prime.c
index 7c1dae5..7215ec8 100644 (file)
--- a/f-prime.c
+++ b/f-prime.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: f-prime.c,v 1.3.4.2 2004/03/20 00:13:31 mdw Exp $
+ * $Id: f-prime.c,v 1.3.4.3 2004/03/21 22:39:46 mdw Exp $
  *
  * Prime fields with Montgomery arithmetic
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: f-prime.c,v $
+ * Revision 1.3.4.3  2004/03/21 22:39:46  mdw
+ * Elliptic curves on binary fields work.
+ *
  * Revision 1.3.4.2  2004/03/20 00:13:31  mdw
  * Projective coordinates for prime curves
  *
@@ -146,6 +149,16 @@ static mp *freduce(field *ff, mp *d, mp *x)
   return (d);
 }
 
+static mp *fsqrt(field *ff, mp *d, mp *x)
+{
+  fctx *f = (fctx *)ff;
+  d = mpmont_reduce(&f->mm, d, x);
+  d = mp_modsqrt(d, d, f->mm.m);
+  if (!d)
+    return (d);
+  return (mpmont_mul(&f->mm, d, d, f->mm.r2));
+}
+
 static mp *fdbl(field *ff, mp *d, mp *x)
 {
   fctx *f = (fctx *)ff;
@@ -189,23 +202,14 @@ static mp *fhlv(field *ff, mp *d, mp *x)
   return (mp_lsr(d, x, 1));
 }
 
-static mp *fsqrt(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  d = mpmont_reduce(&f->mm, d, x);
-  d = mp_modsqrt(d, d, f->mm.m);
-  if (!d)
-    return (d);
-  return (mpmont_mul(&f->mm, d, d, f->mm.r2));
-}
-
 /* --- Field operations table --- */
 
 static field_ops fops = {
   fdestroy,
   fin, fout,
-  fzerop, fneg, fadd, fsub, fmul, fsqr, finv, freduce,
-  fdbl, ftpl, fqdl, fhlv, fsqrt
+  fzerop, fneg, fadd, fsub, fmul, fsqr, finv, freduce, fsqrt,
+  0,
+  fdbl, ftpl, fqdl, fhlv
 };
 
 /* --- @field_prime@ --- *