diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-21 13:55:02 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-03 19:26:56 -0400 |
| commit | 5ecff87d666f47d0003b106c61ada1e25655b81d (patch) | |
| tree | 108956af50bdc6bf5d396014fe700b2c18565244 /crypto/bn/bn_rand.c | |
| parent | 299c9cbb631869026537c96b7431d7682dd3c008 (diff) | |
BN_pseudo_rand is really BN_rand
And BN_pseudo_rand_range is really BN_rand_range.
Document that we might deprecate those functions.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3743)
Diffstat (limited to 'crypto/bn/bn_rand.c')
| -rw-r--r-- | crypto/bn/bn_rand.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c index 9ce4c5f606..a7c7309888 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -14,7 +14,7 @@ #include <openssl/rand.h> #include <openssl/sha.h> -static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom) +static int bnrand(int testing, BIGNUM *rnd, int bits, int top, int bottom) { unsigned char *buf = NULL; int ret = 0, bit, bytes, mask; @@ -46,7 +46,7 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom) if (RAND_bytes(buf, bytes) <= 0) goto err; - if (pseudorand == 2) { + if (testing) { /* * generate patterns that are more likely to trigger BN library bugs */ @@ -98,21 +98,14 @@ int BN_rand(BIGNUM *rnd, int bits, int top, int bottom) return bnrand(0, rnd, bits, top, bottom); } -int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom) -{ - return bnrand(1, rnd, bits, top, bottom); -} - int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom) { - return bnrand(2, rnd, bits, top, bottom); + return bnrand(1, rnd, bits, top, bottom); } /* random number r: 0 <= r < range */ -static int bn_rand_range(int pseudo, BIGNUM *r, const BIGNUM *range) +int BN_rand_range(BIGNUM *r, const BIGNUM *range) { - int (*bn_rand) (BIGNUM *, int, int, int) = - pseudo ? BN_pseudo_rand : BN_rand; int n; int count = 100; @@ -133,7 +126,7 @@ static int bn_rand_range(int pseudo, BIGNUM *r, const BIGNUM *range) * than range */ do { - if (!bn_rand(r, n + 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY)) + if (!BN_rand(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 - @@ -159,7 +152,7 @@ static int bn_rand_range(int pseudo, 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 (!BN_rand(r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY)) return 0; if (!--count) { @@ -174,14 +167,14 @@ static int bn_rand_range(int pseudo, BIGNUM *r, const BIGNUM *range) return 1; } -int BN_rand_range(BIGNUM *r, const BIGNUM *range) +int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom) { - return bn_rand_range(0, r, range); + return BN_rand(rnd, bits, top, bottom); } int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range) { - return bn_rand_range(1, r, range); + return BN_rand_range(r, range); } /* |