Simplify BN_rand_range

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 8b2b9709952ea122a23d404d897386c123551e8b..e2a17a087726fcc0d918806c1448271880d6d651 100644 (file)
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -329,7 +329,7 @@ BIGNUM *BN_CTX_get(BN_CTX *ctx);
 void   BN_CTX_end(BN_CTX *ctx);
 int     BN_rand(BIGNUM *rnd, int bits, int top,int bottom);
 int     BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom);
-int    BN_rand_range(BIGNUM *rnd, BIGNUM *min, BIGNUM *range);
+int    BN_rand_range(BIGNUM *rnd, BIGNUM *range);
 int    BN_num_bits(const BIGNUM *a);
 int    BN_num_bits_word(BN_ULONG);
 BIGNUM *BN_new(void);

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index c5c14130a37b1809da7fa880e43da8a7f0250240..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;
 
@@ -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;
        }

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 1967290bafb01774f29ac400e346f9f830077922..734681733703217a38fc1b14fbe3b195f708b345 100644 (file)
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -181,7 +181,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
 
        /* Get random k */
        do
-               if (!BN_rand_range(&k, NULL, dsa->q)) goto err;
+               if (!BN_rand_range(&k, dsa->q)) goto err;
        while (BN_is_zero(&k));
 
        if ((dsa->method_mont_p == NULL) && (dsa->flags & DSA_FLAG_CACHE_MONT_P))

diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod
index e4c94e3d12d02bb18eaed178123c592723a234ea..2a8bed5fed8f1c75c3c49ff792a0c4e27110865d 100644 (file)
--- a/doc/crypto/BN_rand.pod
+++ b/doc/crypto/BN_rand.pod
@@ -12,7 +12,7 @@ BN_rand, BN_pseudo_rand - generate pseudo-random number
 
  int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom);
 
- int BN_rand_range(BIGNUM *rnd, BIGNUM *min, BIGNUM *range);
+ int BN_rand_range(BIGNUM *rnd, BIGNUM *range);
 
 =head1 DESCRIPTION
 
@@ -28,8 +28,7 @@ non-cryptographic purposes and for certain purposes in cryptographic
 protocols, but usually not for key generation etc.
 
 BN_rand_range() generates a cryptographically strong pseudo-random
-number B<rnd> in the range B<min> E<lt>= B<rnd> E<lt> B<min> + B<range>.
-B<min> may be NULL, in that case 0 E<lt>= B<rnd> E<lt> B<range>.
+number B<rnd> in the range 0 <lt>= B<rnd> E<lt> B<range>.
 
 The PRNG must be seeded prior to calling BN_rand() or BN_rand_range().
 

diff --git a/doc/crypto/bn.pod b/doc/crypto/bn.pod
index 8558ccfcd5c6a0ce045dc8a64f399901b59c1761..f7ce9dfd4359835d2fffe55fb54ecea338ac63ea 100644 (file)
--- a/doc/crypto/bn.pod
+++ b/doc/crypto/bn.pod
@@ -68,7 +68,7 @@ bn - multiprecision integer arithmetics
 
  int BN_rand(BIGNUM *rnd, int bits, int top, int bottom);
  int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom);
- int BN_rand_range(BIGNUM *rnd, BIGNUM *min, BIGNUM *max);
+ int BN_rand_range(BIGNUM *rnd, BIGNUM *range);
 
  BIGNUM *BN_generate_prime(BIGNUM *ret, int bits,int safe, BIGNUM *add,
          BIGNUM *rem, void (*callback)(int, int, void *), void *cb_arg);