X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fbdfd34ebce82921ead337127da7c9c480a1e29d..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/bbs-rand.c

diff --git a/bbs-rand.c b/bbs-rand.c
index dbca23c..90669a7 100644
--- a/bbs-rand.c
+++ b/bbs-rand.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bbs-rand.c,v 1.3 2000/06/17 10:45:21 mdw Exp $
+ * $Id$
  *
  * Blum-Blum-Shub secure random number generator
  *
@@ -27,21 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: bbs-rand.c,v $
- * Revision 1.3  2000/06/17 10:45:21  mdw
- * Typesetting fixes.  Advertise random number generator strength.  Use
- * secure arena for memory allocation.
- *
- * Revision 1.2  1999/12/13 15:34:01  mdw
- * Add support for seeding from a generic pseudorandom source.
- *
- * Revision 1.1  1999/12/10 23:14:59  mdw
- * Blum-Blum-Shub generator, and Blum-Goldwasser encryption.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdarg.h>
@@ -134,8 +119,7 @@ void bbs_step(bbs *b)
 
 void bbs_set(bbs *b, mp *x)
 {
-  if (b->x)
-    mp_drop(b->x);
+  mp_drop(b->x);
   b->x = MP_COPY(x);
   bbs_step(b);
 }
@@ -258,6 +242,16 @@ static int gmisc(grand *r, unsigned op, ...)
         case GRAND_SEEDMP:
 	case GRAND_SEEDRAND:
 	case BBS_SET:
+	case BBS_STEP:
+	case BBS_STEPSZ:
+	case BBS_BITS:
+	case BBS_WRAP:
+	case BBS_FF:
+	case BBS_FFN:
+	case BBS_REW:
+	case BBS_REWN:
+	case BBS_MOD:
+	case BBS_STATE:
           rc = 1;
           break;
         default:
@@ -287,6 +281,50 @@ static int gmisc(grand *r, unsigned op, ...)
     case BBS_SET:
       bbs_set(&g->b, va_arg(ap, mp *));
       break;
+    case BBS_STEP:
+      bbs_step(&g->b);
+      break;
+    case BBS_STEPSZ:
+      rc = g->b.k;
+      break;
+    case BBS_BITS: {
+      unsigned nb = va_arg(ap, unsigned);
+      uint32 *w = va_arg(ap, uint32 *);
+      *w = bbs_bits(&g->b, nb);
+    } break;
+    case BBS_WRAP:
+      bbs_wrap(&g->b);
+      break;
+    case BBS_FF: {
+      const bbs_priv *bp = va_arg(ap, const bbs_priv *);
+      mp *n = va_arg(ap, mp *);
+      bbs_ff(&g->b, bp, n);
+    } break;
+    case BBS_FFN: {
+      const bbs_priv *bp = va_arg(ap, const bbs_priv *);
+      unsigned long n = va_arg(ap, unsigned long);
+      bbs_ffn(&g->b, bp, n);
+    } break;
+    case BBS_REW: {
+      const bbs_priv *bp = va_arg(ap, const bbs_priv *);
+      mp *n = va_arg(ap, mp *);
+      bbs_rew(&g->b, bp, n);
+    } break;
+    case BBS_REWN: {
+      const bbs_priv *bp = va_arg(ap, const bbs_priv *);
+      unsigned long n = va_arg(ap, unsigned long);
+      bbs_rewn(&g->b, bp, n);
+    } break;
+    case BBS_MOD: {
+      mp **n = va_arg(ap, mp **);
+      if (*n) MP_DROP(*n);
+      *n = MP_COPY(g->b.mb.m);
+    } break;
+    case BBS_STATE: {
+      mp **n = va_arg(ap, mp **);
+      if (*n) MP_DROP(*n);
+      *n = MP_COPY(g->b.x);
+    } break;
     default:
       GRAND_BADOP;
       break;