3 files changed, 31 insertions, 10 deletions
diff --git a/src/lib/math/bigint/big_rand.cpp b/src/lib/math/bigint/big_rand.cpp
index 074c368e0..cfc1facee 100644
--- a/src/lib/math/bigint/big_rand.cpp
+++ b/src/lib/math/bigint/big_rand.cpp
@@ -15,7 +15,7 @@ namespace Botan {
 * Randomize this number
 */
 void BigInt::randomize(RandomNumberGenerator& rng,
-                       size_t bitsize)
+                       size_t bitsize, bool set_high_bit)
    {
    set_sign(Positive);
 
@@ -27,9 +27,13 @@ void BigInt::randomize(RandomNumberGenerator& rng,
       {
       secure_vector<byte> array = rng.random_vec(round_up(bitsize, 8) / 8);
 
+      // Always cut unwanted bits
       if(bitsize % 8)
          array[0] &= 0xFF >> (8 - (bitsize % 8));
-      array[0] |= 0x80 >> ((bitsize % 8) ? (8 - bitsize % 8) : 0);
+
+      // Set the highest bit if wanted
+      if (set_high_bit)
+         array[0] |= 0x80 >> ((bitsize % 8) ? (8 - bitsize % 8) : 0);
 
       binary_decode(array);
       }
@@ -41,12 +45,19 @@ void BigInt::randomize(RandomNumberGenerator& rng,
 BigInt BigInt::random_integer(RandomNumberGenerator& rng,
                               const BigInt& min, const BigInt& max)
    {
-   BigInt range = max - min;
+   BigInt delta_upper_bound = max - min - 1;
 
-   if(range <= 0)
+   if(delta_upper_bound < 0)
       throw Invalid_Argument("random_integer: invalid min/max values");
 
-   return (min + (BigInt(rng, range.bits() + 2) % range));
+   // Choose x in [0, delta_upper_bound]
+   BigInt x;
+   do {
+      auto bitsize = delta_upper_bound.bits();
+      x.randomize(rng, bitsize, false);
+   } while(x > delta_upper_bound);
+
+   return min + x;
    }
 
 }
diff --git a/src/lib/math/bigint/bigint.cpp b/src/lib/math/bigint/bigint.cpp
index 242a7fe0b..0a068c53e 100644
--- a/src/lib/math/bigint/bigint.cpp
+++ b/src/lib/math/bigint/bigint.cpp
@@ -87,9 +87,9 @@ BigInt::BigInt(const byte input[], size_t length, Base base)
 /*
 * Construct a BigInt from an encoded BigInt
 */
-BigInt::BigInt(RandomNumberGenerator& rng, size_t bits)
+BigInt::BigInt(RandomNumberGenerator& rng, size_t bits, bool set_high_bit)
    {
-   randomize(rng, bits);
+   randomize(rng, bits, set_high_bit);
    }
 
 /*
diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h
index d866698b3..776884ad9 100644
--- a/src/lib/math/bigint/bigint.h
+++ b/src/lib/math/bigint/bigint.h
@@ -74,11 +74,15 @@ class BOTAN_DLL BigInt
      BigInt(const byte buf[], size_t length, Base base = Binary);
 
      /**
-     * Create a random BigInt of the specified size
+     * \brief Create a random BigInt of the specified size
+     *
      * @param rng random number generator
      * @param bits size in bits
+     * @param set_high_bit if true, the highest bit is always set
+     *
+     * @see randomize
      */
-     BigInt(RandomNumberGenerator& rng, size_t bits);
+     BigInt(RandomNumberGenerator& rng, size_t bits, bool set_high_bit = true);
 
      /**
      * Create BigInt of specified size, all zeros
@@ -431,10 +435,16 @@ class BOTAN_DLL BigInt
 
      /**
      * Fill BigInt with a random number with size of bitsize
+     *
+     * If \p set_high_bit is true, the highest bit will be set, which causes
+     * the entropy to be \a bits-1. Otherwise the highest bit is randomly choosen
+     * by the rng, causing the entropy to be \a bits.
+     *
      * @param rng the random number generator to use
      * @param bitsize number of bits the created random value should have
+     * @param set_high_bit if true, the highest bit is always set
      */
-     void randomize(RandomNumberGenerator& rng, size_t bitsize = 0);
+     void randomize(RandomNumberGenerator& rng, size_t bitsize, bool set_high_bit = true);
 
      /**
      * Store BigInt-value in a given byte array