When OPENSSL_NO_DEPRECATED is defined, deprecated functions are (or should

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

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 9e08ccd22e78fca5cb4795cc35d3a6ab39429c19..480817a4b6299cb80141dd0c18501647111ebe9b 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -201,7 +201,7 @@ 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);
                }
        return(ret);
@@ -230,6 +230,7 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
        {
        int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
        int n;
+       int count = 100;
 
        if (range->neg || BN_is_zero(range))
                {
@@ -263,6 +264,13 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
                                if (BN_cmp(r, range) >= 0)
                                        if (!BN_sub(r, r, range)) return 0;
                                }
+
+                       if (!--count)
+                               {
+                               BNerr(BN_F_BN_RAND_RANGE, BN_R_TOO_MANY_ITERATIONS);
+                               return 0;
+                               }
+                       
                        }
                while (BN_cmp(r, range) >= 0);
                }
@@ -272,6 +280,12 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
                        {
                        /* range = 11..._2  or  range = 101..._2 */
                        if (!bn_rand(r, n, -1, 0)) return 0;
+
+                       if (!--count)
+                               {
+                               BNerr(BN_F_BN_RAND_RANGE, BN_R_TOO_MANY_ITERATIONS);
+                               return 0;
+                               }
                        }
                while (BN_cmp(r, range) >= 0);
                }