/* -*-c-*-
*
- * $Id: mprand.c,v 1.2 1999/12/22 15:55:33 mdw Exp $
+ * $Id: mprand.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
*
* Generate a random multiprecision integer
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* 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: mprand.c,v $
- * Revision 1.2 1999/12/22 15:55:33 mdw
- * Modify `mprand' slightly. Add `mprand_range'.
- *
- * Revision 1.1 1999/12/10 23:23:05 mdw
- * Support for generating random large integers.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <mLib/alloc.h>
mp *mprand(mp *d, unsigned b, grand *r, mpw or)
{
size_t sz = (b + 7) >> 3;
- octet *v = xmalloc(sz);
+ arena *a = (d && (d->f & MP_BURN)) ? arena_secure : arena_global;
+ octet *v = x_alloc(a, sz);
unsigned m;
/* --- Fill buffer with random data --- */
d = mp_loadb(d, v, sz);
d->v[0] |= or;
- free(v);
+ memset(v, 0, sz);
+ x_free(a, v);
return (d);
}
* @grand *r@ = random number source
* @mpw or@ = mask for low-order bits
*
- * Returns: A pseudorandom integer, unformly distributed over the
+ * Returns: A pseudorandom integer, unformly distributed over the
* interval %$[0, l)$%.
*
* Use: Generates a uniformly-distributed pseudorandom number in the
{
size_t b = mp_bits(l);
size_t sz = (b + 7) >> 3;
- octet *v = xmalloc(sz);
+ arena *a = (d && (d->f & MP_BURN)) ? arena_secure : arena_global;
+ octet *v = x_alloc(a, sz);
unsigned m;
/* --- The algorithm --- *
* As usual, the number of iterations expected is two.
*/
- b = (b - 1) & 7;
+ b = ((b - 1) & 7) + 1;
m = (1 << b) - 1;
do {
r->ops->fill(r, v, sz);
/* --- Done --- */
- free(v);
+ memset(v, 0, sz);
+ x_free(a, v);
return (d);
}