X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/8823192f6413bed15cfa884ed3a3cbbb97885657..9b8b6877809f0626e8e3eff1f731b1daa796fecb:/field.h

diff --git a/field.h b/field.h
index 8096700..909332f 100644
--- a/field.h
+++ b/field.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: field.h,v 1.3.4.1 2004/03/20 00:13:31 mdw Exp $
+ * $Id: field.h,v 1.5 2004/03/23 12:08:26 mdw Exp $
  *
  * Definitions for field arithmetic
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: field.h,v $
+ * 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.2  2004/03/21 22:39:46  mdw
+ * Elliptic curves on binary fields work.
+ *
  * Revision 1.3.4.1  2004/03/20 00:13:31  mdw
  * Projective coordinates for prime curves
  *
@@ -53,6 +62,10 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#ifndef CATACOMB_GRAND_H
+#  include "grand.h"
+#endif
+
 #ifndef CATACOMB_MP_H
 #  include "mp.h"
 #endif
@@ -69,6 +82,7 @@ typedef struct field_ops {
   /* --- 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*/);
@@ -81,6 +95,11 @@ typedef struct field_ops {
   mp *(*sqr)(field */*f*/, mp */*d*/, mp */*x*/);
   mp *(*inv)(field */*f*/, mp */*d*/, mp */*x*/);
   mp *(*reduce)(field */*f*/, mp */*d*/, mp */*x*/);
+  mp *(*sqrt)(field */*f*/, mp */*d*/, mp */*x*/);
+
+  /* --- Operations for binary fields only --- */
+
+  mp *(*quadsolve)(field */*f*/, mp */*d*/, mp */*x*/);
 
   /* --- Operations for prime fields only --- */
 
@@ -88,7 +107,6 @@ typedef struct field_ops {
   mp *(*tpl)(field */*f*/, mp */*d*/, mp */*x*/);
   mp *(*qdl)(field */*f*/, mp */*d*/, mp */*x*/);
   mp *(*hlv)(field */*f*/, mp */*d*/, mp */*x*/);
-  mp *(*sqrt)(field */*f*/, mp */*d*/, mp */*x*/);
 
 } field_ops;
 
@@ -105,12 +123,14 @@ typedef struct field_ops {
 #define F_SQR(f, d, x)		(f)->ops->sqr((f), (d), (x))
 #define F_INV(f, d, x)		(f)->ops->inv((f), (d), (x))
 #define F_REDUCE(f, d, x)	(f)->ops->reduce((f), (d), (x))
+#define F_SQRT(f, d, x)		(f)->ops->sqrt((f), (d), (x))
+
+#define F_QUADSOLVE(f, d, x)	(f)->ops->quadsolve((f), (d), (x))
 
 #define F_DBL(f, d, x)		(f)->ops->dbl((f), (d), (x))
 #define F_TPL(f, d, x)		(f)->ops->tpl((f), (d), (x))
 #define F_QDL(f, d, x)		(f)->ops->qdl((f), (d), (x))
 #define F_HLV(f, d, x)		(f)->ops->hlv((f), (d), (x))
-#define F_SQRT(f, d, x)		(f)->ops->sqrt((f), (d), (x))
 
 /*----- Helpful field operations ------------------------------------------*/
 
@@ -154,20 +174,6 @@ extern field *field_prime(mp */*p*/);
 
 extern field *field_binpoly(mp */*p*/);
 
-/* --- @field_binsparsepoly@ --- *
- *
- * Arguments:	@unsigned deg@ = the degree of the field polynomial
- *		@const unsigned *c@ = degrees of nonzero coefficients
- *
- * Returns:	A pointer to the field.
- *
- * Use:		Creates a field structure for a binary field taking advantage
- *		of the sparseness of the given polynomial to improve
- *		reduction performance.
- */
-
-extern field *field_binsparsepoly(unsigned /*deg*/, const unsigned */*c*/);
-
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus