Don't use assertions to check application-provided arguments;

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

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index de5a1f0c6317242cb44cf87cd6d53f6ec129a0b6..f51830b12ba8fde83a584c3455cc1ee215031f5e 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)
                {
@@ -244,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,