X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fcdaa1806c38c703a6e72b87e189396a05d165e4..8cd9f01dac408893755906282d79284c1ee7ddd6:/prim.h

diff --git a/prim.h b/prim.h
index 30392cd..1df2ed6 100644
--- a/prim.h
+++ b/prim.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: prim.h,v 1.1 1999/12/22 15:58:59 mdw Exp $
+ * $Id: prim.h,v 1.3 2004/04/08 01:36:15 mdw Exp $
  *
  * Finding primitive elements
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: prim.h,v $
- * Revision 1.1  1999/12/22 15:58:59  mdw
- * Search for primitive elements using prime-search equipment.
- *
- */
-
 #ifndef CATACOMB_PRIM_H
 #define CATACOMB_PRIM_H
 
@@ -64,23 +56,31 @@
  *
  * All fields must be configured by the client.  Set @n@ to zero to discover
  * generators of the subgroup of order %$m / f$%.
+ *
+ * Let %$p = \prod q_i + 1$% be a prime number.  In order to find an element
+ * %$g$% with order %$o$%, we choose elements %$h_j$% from %$\gf{p}^*$%,
+ * compute $%g_j = h_j^{p/o}$%, rejecting %$h_j$% where %$g_j = 1$%, and then
+ * for each proper prime factor %$q_i$% of %$p/o$% we check that
+ * %$g^{f_i} \ne 1$%, where the %$f_i$% are cofactors of the %$q_i$%
+ * (%$f_i q_i = p/o$%).
  */
 
 typedef struct prim_ctx {
   mpmont mm;				/* Montgomery context for modulus */
-  mp *f;				/* Array of factors */
-  size_t n;				/* Number of factors */
+  mp *exp;				/* Exponent (%$p/o$%; may be zero) */
+  size_t n;				/* Number of cofactors */
+  mp **f;				/* Array of cofactors */
 } prim_ctx;
 
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @prim_test@ --- */
 
-extern int prim_test(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc prim_test;
 
 /* --- @prim_step@ --- */
 
-extern int prim_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc prim_step;
 
 /*----- That's all, folks -------------------------------------------------*/