X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/ab9fc001a865ff5c9e08e84298be9bcb9cc61e1b..80be023065ced106a4078a36371c135a60d2bd6c:/mprand.c

diff --git a/mprand.c b/mprand.c
index bf8af69..0baae4f 100644
--- a/mprand.c
+++ b/mprand.c
@@ -1,6 +1,6 @@
 /* -*-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
  *
@@ -27,17 +27,6 @@
  * 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>
@@ -67,7 +56,8 @@
 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 --- */
@@ -87,7 +77,8 @@ mp *mprand(mp *d, unsigned b, grand *r, mpw or)
 
   d = mp_loadb(d, v, sz);
   d->v[0] |= or;
-  free(v);
+  memset(v, 0, sz);
+  x_free(a, v);
   return (d);
 }
 
@@ -109,7 +100,8 @@ mp *mprand_range(mp *d, mp *l, grand *r, mpw or)
 {
   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 --- *
@@ -129,7 +121,7 @@ mp *mprand_range(mp *d, mp *l, grand *r, mpw or)
    * 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);
@@ -140,7 +132,8 @@ mp *mprand_range(mp *d, mp *l, grand *r, mpw or)
 
   /* --- Done --- */
 
-  free(v);
+  memset(v, 0, sz);
+  x_free(a, v);
   return (d);
 }