~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/mkphrase.c: Fix trailing spaces in usage message.
[catacomb]
/
pub
/
bbs-gen.c
diff --git
a/pub/bbs-gen.c
b/pub/bbs-gen.c
index
f57683f
..
6ec65e2
100644
(file)
--- a/
pub/bbs-gen.c
+++ b/
pub/bbs-gen.c
@@
-65,14
+65,14
@@
int bbs_gen(bbs_priv *bp, unsigned nbits, grand *r, unsigned n,
pgen_jumpctx j;
pgen_gcdstepctx g;
unsigned nb = nbits/2;
pgen_jumpctx j;
pgen_gcdstepctx g;
unsigned nb = nbits/2;
- mp *x = MP_NEW;
+ mp *x = MP_NEW
SEC
;
/* --- Generate @p@ --- */
if ((x = strongprime_setup("p", x, &jp, nb, r, n, event, ectx)) == 0)
goto fail_x;
j.j = &jp;
/* --- Generate @p@ --- */
if ((x = strongprime_setup("p", x, &jp, nb, r, n, event, ectx)) == 0)
goto fail_x;
j.j = &jp;
- bp->p = pgen("p", MP_NEW, x, event, ectx, n, pgen_jump, &j,
+ bp->p = pgen("p", MP_NEW
SEC
, x, event, ectx, n, pgen_jump, &j,
rabin_iters(nb), pgen_test, &rb);
pfilt_destroy(&jp);
if (!bp->p) goto fail_p;
rabin_iters(nb), pgen_test, &rb);
pfilt_destroy(&jp);
if (!bp->p) goto fail_p;
@@
-88,7
+88,7
@@
int bbs_gen(bbs_priv *bp, unsigned nbits, grand *r, unsigned n,
g.r = mp_lsr(MP_NEW, bp->p, 1);
g.g = MP_NEW;
g.max = MP_ONE;
g.r = mp_lsr(MP_NEW, bp->p, 1);
g.g = MP_NEW;
g.max = MP_ONE;
- bp->q = pgen("q", MP_NEW, x, event, ectx, n, pgen_gcdstep, &g,
+ bp->q = pgen("q", MP_NEW
SEC
, x, event, ectx, n, pgen_gcdstep, &g,
rabin_iters(nb), pgen_test, &rb);
pfilt_destroy(&g.jp);
mp_drop(g.r);
rabin_iters(nb), pgen_test, &rb);
pfilt_destroy(&g.jp);
mp_drop(g.r);
@@
-98,11
+98,14
@@
int bbs_gen(bbs_priv *bp, unsigned nbits, grand *r, unsigned n,
/* --- Compute @n@ --- */
bp->n = mp_mul(MP_NEW, bp->p, bp->q);
/* --- Compute @n@ --- */
bp->n = mp_mul(MP_NEW, bp->p, bp->q);
+ if (mp_bits(bp->n) != nbits) goto fail_n;
mp_drop(x);
return (PGEN_DONE);
/* --- Tidy up if things went wrong --- */
mp_drop(x);
return (PGEN_DONE);
/* --- Tidy up if things went wrong --- */
+fail_n:
+ mp_drop(bp->n);
fail_q:
mp_drop(bp->p);
fail_p:
fail_q:
mp_drop(bp->p);
fail_p: