Rename `bbs_params' to `bbs_param' for consistency.

diff --git a/bbs-jump.c b/bbs-jump.c
index 629871d..8e7109d 100644 (file)
--- a/bbs-jump.c
+++ b/bbs-jump.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bbs-jump.c,v 1.1 1999/12/10 23:14:59 mdw Exp $
+ * $Id: bbs-jump.c,v 1.2 1999/12/22 15:52:08 mdw Exp $
  *
  * Jumping around a BBS sequence
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bbs-jump.c,v $
+ * Revision 1.2  1999/12/22 15:52:08  mdw
+ * Rename `bbs_params' to `bbs_param' for consistency.
+ *
  * Revision 1.1  1999/12/10 23:14:59  mdw
  * Blum-Blum-Shub generator, and Blum-Goldwasser encryption.
  *
@@ -48,7 +51,7 @@
 /* --- @jump@ --- *
  *
  * Arguments:  @bbs *b@ = pointer to BBS generator context
- *             @bbs_params *bp@ = pointer to BBS modulus factors
+ *             @bbs_param *bp@ = pointer to BBS modulus factors
  *             @unsigned long n@ = number of steps to move
  *             @mp *px@ = exponent mod @p@ for a one-step jump
  *             @mp *qx@ = exponent mod @q@ for a one-step jump
@@ -86,7 +89,7 @@
  *             %$p \equiv 3 \pmod 4$%.)
  */
 
-static void jump(bbs *b, bbs_params *bp, unsigned long n,
+static void jump(bbs *b, bbs_param *bp, unsigned long n,
                 mp *px, mp *qx)
 {
   mp *ep, *eq;
@@ -166,7 +169,7 @@ static void jump(bbs *b, bbs_params *bp, unsigned long n,
 /* --- @bbs_ff@ --- *
  *
  * Arguments:  @bbs *b@ = pointer to a BBS generator state
- *             @bbs_params *bp@ = pointer to BBS modulus factors
+ *             @bbs_param *bp@ = pointer to BBS modulus factors
  *             @unsigned long n@ = number of steps to make
  *
  * Returns:    ---
@@ -176,7 +179,7 @@ static void jump(bbs *b, bbs_params *bp, unsigned long n,
  *             efficiently.
  */
 
-void bbs_ff(bbs *b, bbs_params *bp, unsigned long n)
+void bbs_ff(bbs *b, bbs_param *bp, unsigned long n)
 {
   jump(b, bp, n, MP_TWO, MP_TWO);
 }
@@ -184,7 +187,7 @@ void bbs_ff(bbs *b, bbs_params *bp, unsigned long n)
 /* --- @bbs_rew@ --- *
  *
  * Arguments:  @bbs *b@ = pointer to a BBS generator state
- *             @bbs_params *bp@ = pointer to BBS modulus factors
+ *             @bbs_param *bp@ = pointer to BBS modulus factors
  *             @unsigned long n@ = number of steps to make
  *
  * Returns:    ---
@@ -194,7 +197,7 @@ void bbs_ff(bbs *b, bbs_params *bp, unsigned long n)
  *             at all.
  */
 
-void bbs_rew(bbs *b, bbs_params *bp, unsigned long n)
+void bbs_rew(bbs *b, bbs_param *bp, unsigned long n)
 {
   mp *px = mp_lsr(MP_NEW, bp->p, 2);
   mp *qx = mp_lsr(MP_NEW, bp->q, 2);
@@ -211,7 +214,7 @@ void bbs_rew(bbs *b, bbs_params *bp, unsigned long n)
 
 static int verify(dstr *v)
 {
-  bbs_params bp;
+  bbs_param bp;
   bbs b;
   mp *x;
   unsigned long n;

diff --git a/bbs.h b/bbs.h
index 851dcb8..485fb76 100644 (file)
--- a/bbs.h
+++ b/bbs.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bbs.h,v 1.1 1999/12/10 23:14:59 mdw Exp $
+ * $Id: bbs.h,v 1.2 1999/12/22 15:52:08 mdw Exp $
  *
  * The Blum-Blum-Shub random bit generator
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bbs.h,v $
+ * Revision 1.2  1999/12/22 15:52:08  mdw
+ * Rename `bbs_params' to `bbs_param' for consistency.
+ *
  * Revision 1.1  1999/12/10 23:14:59  mdw
  * Blum-Blum-Shub generator, and Blum-Goldwasser encryption.
  *
@@ -74,6 +77,10 @@
 #  include "mpbarrett.h"
 #endif
 
+#ifndef CATACOMB_PGEN_H
+#  include "pgen.h"
+#endif
+
 /*----- Data structures ---------------------------------------------------*/
 
 /* --- Basic generator state --- */
@@ -88,28 +95,10 @@ typedef struct bbs {
 
 /* --- Parameters --- */
 
-typedef struct bbs_params {
+typedef struct bbs_param {
   mp *p, *q;                           /* Prime factors (3 mod 4) */
   mp *n;                               /* Product @pq@ -- a Blum integer */
-} bbs_params;
-
-/*----- Event codes from @bbs_gen@ ----------------------------------------*/
-
-enum {
-  BBSEV_OK,
-
-  BBSEV_FINDP,
-  BBSEV_TRYP,
-  BBSEV_PASSP,
-  BBSEV_FAILP,
-  BBSEV_GOODP,
-
-  BBSEV_FINDQ,
-  BBSEV_TRYQ,
-  BBSEV_PASSQ,
-  BBSEV_FAILQ,
-  BBSEV_GOODQ
-};  
+} bbs_param;
 
 /*----- The basic generator -----------------------------------------------*/
 
@@ -210,7 +199,7 @@ extern void bbs_wrap(bbs */*b*/);
 /* --- @bbs_ff@ --- *
  *
  * Arguments:  @bbs *b@ = pointer to a BBS generator state
- *             @bbs_params *bp@ = pointer to BBS modulus factors
+ *             @bbs_param *bp@ = pointer to BBS modulus factors
  *             @unsigned long n@ = number of steps to make
  *
  * Returns:    ---
@@ -220,12 +209,12 @@ extern void bbs_wrap(bbs */*b*/);
  *             efficiently.
  */
 
-extern void bbs_ff(bbs */*b*/, bbs_params */*bp*/, unsigned long /*n*/);
+extern void bbs_ff(bbs */*b*/, bbs_param */*bp*/, unsigned long /*n*/);
 
 /* --- @bbs_rew@ --- *
  *
  * Arguments:  @bbs *b@ = pointer to a BBS generator state
- *             @bbs_params *bp@ = pointer to BBS modulus factors
+ *             @bbs_param *bp@ = pointer to BBS modulus factors
  *             @unsigned long n@ = number of steps to make
  *
  * Returns:    ---
@@ -235,20 +224,19 @@ extern void bbs_ff(bbs */*b*/, bbs_params */*bp*/, unsigned long /*n*/);
  *             at all.
  */
 
-extern void bbs_rew(bbs */*b*/, bbs_params */*bp*/, unsigned long /*n*/);
+extern void bbs_rew(bbs */*b*/, bbs_param */*bp*/, unsigned long /*n*/);
 
 /*----- Parameter generation ----------------------------------------------*/
 
 /* --- @bbs_gen@ --- *
  *
- * Arguments:  @bbs_params *bp@ = pointer to parameter block
+ * Arguments:  @bbs_param *bp@ = pointer to parameter block
  *             @mp *p, *q@ = initial numbers to search from
  *             @size_t n@ = number of attempts to make
- *             @void (*proc)(int ev, mp *m, void *p)@ = event handler
- *             @void *arg@ = argument for event handler
+ *             @pgen_proc *event@ = event handler function
+ *             @void *ectx@ = argument for event handler
  *
- * Returns:    Zero if all went well, otherwise an event code which explains
- *             the problem.
+ * Returns:    If it worked OK, @PGEN_DONE@, otherwise @PGEN_ABORT@.
  *
  * Use:                Finds two prime numbers %$p'$% and %$q'$% such that both are
  *             congruent to %$3 \bmod 4$%, and  $(p - 1)/2$% and
@@ -257,9 +245,8 @@ extern void bbs_rew(bbs */*b*/, bbs_params */*bp*/, unsigned long /*n*/);
  *             Shub pseudorandom bit generator.
  */
 
-extern int bbs_gen(bbs_params */*bp*/, mp */*p*/, mp */*q*/, size_t /*n*/,
-                  int (*/*proc*/)(int /*ev*/, mp */*m*/, void */*p*/),
-                  void */*arg*/);
+extern int bbs_gen(bbs_param */*bp*/, mp */*p*/, mp */*q*/, size_t /*n*/,
+                  pgen_proc */*event*/, void */*ectx*/);
 
 /*----- Generic random number generator interface -------------------------*/