diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2018-03-05 00:29:21 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2018-03-06 18:32:35 +0100 |
| commit | 3bc0ab06b0224fb72d08baa1843f3d36be361162 (patch) | |
| tree | 885dab5034a52e42254055d99a6520becbb34ea3 /crypto/bn | |
| parent | Add support for .include directive in config files (diff) | |
| download | openssl-3bc0ab06b0224fb72d08baa1843f3d36be361162.tar.xz openssl-3bc0ab06b0224fb72d08baa1843f3d36be361162.zip | |
bnrand_range: Always call bnrand() with the correct flag
It was calling the BN_rand() when it should have call BN_priv_rand()
Reviewed-by: Tim Hudson <tjh@openssl.org>
GH: #5514
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/bn_rand.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c index 0be21600b2..743779f9d7 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -112,7 +112,7 @@ int BN_priv_rand(BIGNUM *rnd, int bits, int top, int bottom) /* random number r: 0 <= r < range */ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range) { - int b, n; + int n; int count = 100; if (range->neg || BN_is_zero(range)) { @@ -132,11 +132,9 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range) * than range */ do { - b = flag == NORMAL - ? BN_rand(r, n + 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY) - : BN_priv_rand(r, n + 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY); - if (!b) + if (!bnrand(flag, r, n + 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY)) return 0; + /* * If r < 3*range, use r := r MOD range (which is either r, r - * range, or r - 2*range). Otherwise, iterate once more. Since @@ -161,7 +159,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range) } else { do { /* range = 11..._2 or range = 101..._2 */ - if (!BN_rand(r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY)) + if (!bnrand(flag, r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY)) return 0; if (!--count) { |