s390x-mont.pl: optimize prologue.

[openssl.git] / crypto / bn / bn_rand.c

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index e6705f7025bd82e039a7a261f45d1b76820fce15..b376c28ff3ff25b027922964af6ca26b4995250a 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -134,13 +134,13 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
        buf=(unsigned char *)OPENSSL_malloc(bytes);
        if (buf == NULL)
                {
-               BNerr(BN_F_BN_RAND,ERR_R_MALLOC_FAILURE);
+               BNerr(BN_F_BNRAND,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
        /* make a random number and set the top and bottom bits */
        time(&tim);
-       RAND_add(&tim,sizeof(tim),0);
+       RAND_add(&tim,sizeof(tim),0.0);
 
        if (pseudorand)
                {
@@ -201,9 +201,10 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
 err:
        if (buf != NULL)
                {
-               memset(buf,0,bytes);
+               OPENSSL_cleanse(buf,bytes);
                OPENSSL_free(buf);
                }
+       bn_check_top(rnd);
        return(ret);
        }
 
@@ -226,7 +227,7 @@ int     BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom)
 
 
 /* random number r:  0 <= r < range */
-static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
+static int bn_rand_range(int pseudo, BIGNUM *r, const BIGNUM *range)
        {
        int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
        int n;
@@ -243,9 +244,7 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
        /* BN_is_bit_set(range, n - 1) always holds */
 
        if (n == 1)
-               {
-               if (!BN_zero(r)) return 0;
-               }
+               BN_zero(r);
        else if (!BN_is_bit_set(range, n - 2) && !BN_is_bit_set(range, n - 3))
                {
                /* range = 100..._2,
@@ -290,16 +289,17 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
                while (BN_cmp(r, range) >= 0);
                }
 
+       bn_check_top(r);
        return 1;
        }
 
 
-int    BN_rand_range(BIGNUM *r, BIGNUM *range)
+int    BN_rand_range(BIGNUM *r, const BIGNUM *range)
        {
        return bn_rand_range(0, r, range);
        }
 
-int    BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range)
+int    BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range)
        {
        return bn_rand_range(1, r, range);
        }