X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/c3caa2face1cda7002eb58245ad75865bf437455..bc985cefafea2e1b02095a2ff2a9982c4c647d17:/field.h

diff --git a/field.h b/field.h
index dd674c9..db27e63 100644
--- a/field.h
+++ b/field.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: field.h,v 1.4 2004/03/21 22:52:06 mdw Exp $
+ * $Id: field.h,v 1.6 2004/03/23 15:19:32 mdw Exp $
  *
  * Definitions for field arithmetic
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: field.h,v $
+ * 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.
  *
@@ -59,6 +65,10 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#ifndef CATACOMB_GRAND_H
+#  include "grand.h"
+#endif
+
 #ifndef CATACOMB_MP_H
 #  include "mp.h"
 #endif
@@ -70,11 +80,22 @@ typedef struct field {
   mp *zero, *one;			/* Identities in the field */
 } field;
 
+enum {
+  FTY_PRIME,
+  FTY_BINARY
+};
+
 typedef struct field_ops {
 
+  /* --- General information --- */
+
+  unsigned ty;				/* What kind of field this is */
+  const char *name;			/* Human-readable name string */
+
   /* --- Universal operations --- */
 
   void (*destroy)(field */*f*/);
+  mp *(*rand)(field */*f*/, mp */*d*/, grand */*r*/);
 
   mp *(*in)(field */*f*/, mp */*d*/, mp */*x*/);
   mp *(*out)(field */*f*/, mp */*d*/, mp */*x*/);
@@ -102,7 +123,11 @@ typedef struct field_ops {
 
 } field_ops;
 
+#define F_TYPE(f)		(f)->ops->ty
+#define F_NAME(f)		(f)->ops->name
+
 #define F_DESTROY(f)		(f)->ops->destroy((f))
+#define F_RAND(f, d, r)		(f)->ops->rand((f), (d), (r))
 
 #define F_IN(f, d, x)		(f)->ops->in((f), (d), (x))
 #define F_OUT(f, d, x)		(f)->ops->out((f), (d), (x))