key-flags.c, key-pack.c, key-pass.c: Don't use the `key.h' machinery.

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

diff --git a/f-binpoly.c b/f-binpoly.c
index 4282ad4..5f6a527 100644 (file)
--- a/f-binpoly.c
+++ b/f-binpoly.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: f-binpoly.c,v 1.9 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Binary fields with polynomial basis representation
  *
  * (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,51 +32,57 @@
 #include <mLib/sub.h>
 
 #include "field.h"
-#include "gf.h"
-#include "gfreduce.h"
+#include "field-guts.h"
 #include "mprand.h"
-#include "gfn.h"
 
 /*----- Polynomial basis --------------------------------------------------*/
 
-typedef struct fctx {
-  field f;
-  gfreduce r;
-} fctx;
-
 /* --- Field operations --- */
 
-static void fdestroy(field *ff)
-  { fctx *f = (fctx *)ff; gfreduce_destroy(&f->r); DESTROY(f); }
+static void fdestroy(field *ff) {
+  fctx_binpoly *f = (fctx_binpoly *)ff;
+  gfreduce_destroy(&f->r); MP_DROP(f->f.q);
+  DESTROY(f);
+}
 
-static mp *frand(field *f, mp *d, grand *r)
-  { return (mprand(d, f->nbits, r, 0)); }
+static mp *frand(field *f, mp *d, grand *r) {
+  return (mprand(d, f->nbits, r, 0));
+}
 
-static int fzerop(field *ff, mp *x) { return (!MP_LEN(x)); }
+static int fzerop(field *ff, mp *x) { return (MP_ZEROP(x)); }
 
 static mp *fadd(field *ff, mp *d, mp *x, mp *y) { return (gf_add(d, x, y)); }
 
 static mp *fmul(field *ff, mp *d, mp *x, mp *y) {
-  fctx *f = (fctx *)ff; d = gf_mul(d, x, y);
+  fctx_binpoly *f = (fctx_binpoly *)ff; d = gf_mul(d, x, y);
   return (gfreduce_do(&f->r, d, d));
 }
 
 static mp *fsqr(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; d = gf_sqr(d, x);
+  fctx_binpoly *f = (fctx_binpoly *)ff; d = gf_sqr(d, x);
   return (gfreduce_do(&f->r, d, d));
 }
 
-static mp *finv(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; d = gf_modinv(d, x, f->r.p); return (d); }
+static mp *finv(field *ff, mp *d, mp *x) {
+  fctx_binpoly *f = (fctx_binpoly *)ff;
+  d = gf_modinv(d, x, f->r.p);
+  return (d);
+}
 
-static mp *freduce(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; return (gfreduce_do(&f->r, d, x)); }
+static mp *freduce(field *ff, mp *d, mp *x) {
+  fctx_binpoly *f = (fctx_binpoly *)ff;
+  return (gfreduce_do(&f->r, d, x));
+}
 
-static mp *fsqrt(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; return (gfreduce_sqrt(&f->r, d, x)); }
+static mp *fsqrt(field *ff, mp *d, mp *x) {
+  fctx_binpoly *f = (fctx_binpoly *)ff;
+  return (gfreduce_sqrt(&f->r, d, x));
+}
 
-static mp *fquadsolve(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; return (gfreduce_quadsolve(&f->r, d, x)); }
+static mp *fquadsolve(field *ff, mp *d, mp *x) {
+  fctx_binpoly *f = (fctx_binpoly *)ff;
+  return (gfreduce_quadsolve(&f->r, d, x));
+}
 
 /* --- Field operations table --- */
 
@@ -100,7 +106,7 @@ static const field_ops fops = {
 
 field *field_binpoly(mp *p)
 {
-  fctx *f = CREATE(fctx);
+  fctx_binpoly *f = CREATE(fctx_binpoly);
   f->f.ops = &fops;
   f->f.zero = MP_ZERO;
   f->f.one = MP_ONE;
@@ -108,34 +114,34 @@ field *field_binpoly(mp *p)
   f->f.noctets = (f->f.nbits + 7) >> 3;
   gfreduce_create(&f->r, p);
   f->f.m = f->r.p;
+  f->f.q = mp_lsl(MP_NEW, MP_ONE, f->f.nbits);
   return (&f->f);
 }
 
 /*----- Normal basis ------------------------------------------------------*/
 
-typedef struct fnctx {
-  fctx f;
-  gfn ntop, pton;
-} fnctx;
-
 /* --- Field operations --- */
 
 static void fndestroy(field *ff) {
-  fnctx *f = (fnctx *)ff; gfreduce_destroy(&f->f.r);
-  gfn_destroy(&f->ntop); gfn_destroy(&f->pton);
+  fctx_binnorm *f = (fctx_binnorm *)ff; gfreduce_destroy(&f->f.r);
+  gfn_destroy(&f->ntop); gfn_destroy(&f->pton); MP_DROP(f->f.f.q);
   DESTROY(f);
 }
 
 static int fnsamep(field *ff, field *gg) {
-  fnctx *f = (fnctx *)ff, *g = (fnctx *)gg;
+  fctx_binnorm *f = (fctx_binnorm *)ff, *g = (fctx_binnorm *)gg;
   return (MP_EQ(f->ntop.r[0], g->ntop.r[0]) && field_stdsamep(ff, gg));
 }
 
-static mp *fnin(field *ff, mp *d, mp *x)
-  { fnctx *f = (fnctx *)ff; return (gfn_transform(&f->ntop, d, x)); }
+static mp *fnin(field *ff, mp *d, mp *x) {
+  fctx_binnorm *f = (fctx_binnorm *)ff;
+  return (gfn_transform(&f->ntop, d, x));
+}
 
-static mp *fnout(field *ff, mp *d, mp *x)
-  { fnctx *f = (fnctx *)ff; return (gfn_transform(&f->pton, d, x)); }
+static mp *fnout(field *ff, mp *d, mp *x) {
+  fctx_binnorm *f = (fctx_binnorm *)ff;
+  return (gfn_transform(&f->pton, d, x));
+}
 
 /* --- Field operations table --- */
 
@@ -162,7 +168,7 @@ static const field_ops fnops = {
 
 field *field_binnorm(mp *p, mp *beta)
 {
-  fnctx *f = CREATE(fnctx);
+  fctx_binnorm *f = CREATE(fctx_binnorm);
   f->f.f.ops = &fnops;
   f->f.f.zero = MP_ZERO;
   f->f.f.one = MP_ONE;
@@ -170,6 +176,7 @@ field *field_binnorm(mp *p, mp *beta)
   f->f.f.noctets = (f->f.f.nbits + 7) >> 3;
   gfreduce_create(&f->f.r, p);
   f->f.f.m = f->f.r.p;
+  f->f.f.q = mp_lsl(MP_NEW, MP_ONE, f->f.f.nbits);
   gfn_create(p, beta, &f->ntop, &f->pton);
   return (&f->f.f);
 }