/* -*-c-*-
*
- * $Id: f-prime.c,v 1.3.4.2 2004/03/20 00:13:31 mdw Exp $
+ * $Id: f-prime.c,v 1.7 2004/03/27 17:54:11 mdw Exp $
*
* Prime fields with Montgomery arithmetic
*
/*----- Revision history --------------------------------------------------*
*
* $Log: f-prime.c,v $
+ * Revision 1.7 2004/03/27 17:54:11 mdw
+ * Standard curves and curve checking.
+ *
+ * Revision 1.6 2004/03/23 15:19:32 mdw
+ * Test elliptic curves more thoroughly.
+ *
+ * Revision 1.5 2004/03/23 12:08:26 mdw
+ * Random field-element selection.
+ *
+ * Revision 1.4 2004/03/21 22:52:06 mdw
+ * Merge and close elliptic curve branch.
+ *
+ * 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
*
#include "field.h"
#include "mpmont.h"
+#include "mprand.h"
/*----- Data structures ---------------------------------------------------*/
DESTROY(f);
}
+static mp *frand(field *ff, mp *d, grand *r)
+{
+ fctx *f = (fctx *)ff;
+ return (mprand_range(d, f->mm.m, r, 0));
+}
+
static mp *fin(field *ff, mp *d, mp *x)
{
fctx *f = (fctx *)ff;
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;
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,
+ FTY_PRIME, "prime",
+ fdestroy, frand,
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@ --- *
mpmont_create(&f->mm, p);
f->f.zero = MP_ZERO;
f->f.one = f->mm.r;
+ f->f.m = f->mm.m;
+ f->f.nbits = mp_bits(p);
+ f->f.noctets = (f->f.nbits + 7) >> 3;
return (&f->f);
}