sha512-x86_64.pl: fix typo.

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

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index a58a77988c1d7667b64583f98f15d8048e12560d..8d74895dedde6eebda62be5d9abb1164019e6409 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -109,6 +109,8 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
@@ -208,18 +210,18 @@ err:
        return(ret);
        }
 
-int     BN_rand(BIGNUM *rnd, size_t bits, int top, int bottom)
+int     BN_rand(BIGNUM *rnd, int bits, int top, int bottom)
        {
        return bnrand(0, rnd, bits, top, bottom);
        }
 
-int     BN_pseudo_rand(BIGNUM *rnd, size_t bits, int top, int bottom)
+int     BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom)
        {
        return bnrand(1, rnd, bits, top, bottom);
        }
 
 #if 1
-int     BN_bntest_rand(BIGNUM *rnd, size_t bits, int top, int bottom)
+int     BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom)
        {
        return bnrand(2, rnd, bits, top, bottom);
        }
@@ -229,8 +231,7 @@ int     BN_bntest_rand(BIGNUM *rnd, size_t bits, int top, int bottom)
 /* random number r:  0 <= r < range */
 static int bn_rand_range(int pseudo, BIGNUM *r, const BIGNUM *range)
        {
-       int (*bn_rand)(BIGNUM *, size_t, int, int)
-           = pseudo ? BN_pseudo_rand : BN_rand;
+       int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
        int n;
        int count = 100;
 
@@ -246,7 +247,15 @@ static int bn_rand_range(int pseudo, BIGNUM *r, const BIGNUM *range)
 
        if (n == 1)
                BN_zero(r);
+#ifdef OPENSSL_FIPS
+       /* FIPS 186-3 is picky about how random numbers for keys etc are
+        * generated. So we just use the second case which is equivalent to
+        * "Generation by Testing Candidates" mentioned in B.1.2 et al.
+        */
+       else if (!FIPS_module_mode() && !BN_is_bit_set(range, n - 2) && !BN_is_bit_set(range, n - 3))
+#else
        else if (!BN_is_bit_set(range, n - 2) && !BN_is_bit_set(range, n - 3))
+#endif
                {
                /* range = 100..._2,
                 * so  3*range (= 11..._2)  is exactly one bit longer than  range */