/* -*-c-*-
*
- * $Id: bbs-rand.c,v 1.1 1999/12/10 23:14:59 mdw Exp $
+ * $Id: bbs-rand.c,v 1.4 2001/02/03 12:00:29 mdw Exp $
*
* Blum-Blum-Shub secure random number generator
*
/*----- Revision history --------------------------------------------------*
*
* $Log: bbs-rand.c,v $
+ * Revision 1.4 2001/02/03 12:00:29 mdw
+ * Now @mp_drop@ checks its argument is non-NULL before attempting to free
+ * it. Note that the macro version @MP_DROP@ doesn't do this.
+ *
+ * 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.
*
#include <mLib/bits.h>
#include <mLib/sub.h>
+#include "arena.h"
#include "bbs.h"
#include "grand.h"
#include "mp.h"
#include "mpbarrett.h"
#include "mpint.h"
+#include "mprand.h"
+#include "paranoia.h"
/*----- Main code ---------------------------------------------------------*/
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);
}
*
* If a generator is seeded, %$b$% bits are extracted, and then
* @bbs_wrap@ is called, the generator will have been stepped
- * %$\lceil b/k \rceil% times.
+ * %$\lceil b/k \rceil$% times.
*/
void bbs_wrap(bbs *b)
{
gctx *g = (gctx *)r;
bbs_destroy(&g->b);
- DESTROY(g);
+ BURN(*g);
+ S_DESTROY(g);
}
static int gmisc(grand *r, unsigned op, ...)
case GRAND_SEEDINT:
case GRAND_SEEDUINT32:
case GRAND_SEEDMP:
+ case GRAND_SEEDRAND:
case BBS_SET:
rc = 1;
break;
case GRAND_SEEDMP:
bbs_seed(&g->b, va_arg(ap, mp *));
break;
+ case GRAND_SEEDRAND: {
+ grand *rr = va_arg(ap, grand *);
+ mp *m = mprand(MP_NEW, mp_bits(g->b.mb.m) - 1, rr, 0);
+ bbs_seed(&g->b, m);
+ mp_drop(m);
+ } break;
case BBS_SET:
bbs_set(&g->b, va_arg(ap, mp *));
break;
static const grand_ops gops = {
"bbs",
- 0,
+ GRAND_CRYPTO, 0,
gmisc, gdestroy,
gword, gbyte, gword, grand_range, grand_fill
};
grand *bbs_rand(mp *m, mp *x)
{
- gctx *g = CREATE(gctx);
+ gctx *g = S_CREATE(gctx);
g->r.ops = &gops;
bbs_create(&g->b, m, x);
return (&g->r);