Simplify BN_rand_range

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

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index a2e1fdd3e43f93e210f3306119b90584b6a01499..54d622e6b412f5fe508633188d2f3ae2a9d6cfa2 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -169,8 +169,9 @@ int     BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom)
        }
 #endif
 
-/* random number r: min <= r < min+range */
-int    BN_rand_range(BIGNUM *r, BIGNUM *min, BIGNUM *range)
+
+/* random number r:  0 <= r < range */
+int    BN_rand_range(BIGNUM *r, BIGNUM *range)
        {
        int n;
 
@@ -190,7 +191,7 @@ int BN_rand_range(BIGNUM *r, BIGNUM *min, BIGNUM *range)
                {
                do
                        {
-                       /* range = 11..._2, so each iteration succeeds with probability > .5 */
+                       /* range = 11..._2, so each iteration succeeds with probability >= .75 */
                        if (!BN_rand(r, n, 0, 0)) return 0;
                        }
                while (BN_cmp(r, range) >= 0);
@@ -206,7 +207,7 @@ int BN_rand_range(BIGNUM *r, BIGNUM *min, BIGNUM *range)
                         * (which is either  r, r - range,  or  r - 2*range).
                         * Otherwise, iterate once more.
                         * Since  3*range = 11..._2, each iteration succeeds with
-                        * probability > .5. */
+                        * probability >= .75. */
                        if (BN_cmp(r ,range) >= 0)
                                {
                                if (!BN_sub(r, r, range)) return 0;
@@ -217,10 +218,5 @@ int        BN_rand_range(BIGNUM *r, BIGNUM *min, BIGNUM *range)
                while (BN_cmp(r, range) >= 0);
                }
 
-       if (min != NULL)
-               {
-               if (!BN_add(r, r, min)) return 0;
-               }
-       
        return 1;
        }