generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let BN_rand_range() abort with an error after 100 iterations

Browse Source 
without success.
This commit is contained in:
Bodo Möller 2002-08-02 15:02:03 +00:00
parent be8a280e0b
commit 95ecacf8a2
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -4,6 +4,10 @@
Changes between 0.9.7 and 0.9.8 [xx XXX 2002] Changes between 0.9.7 and 0.9.8 [xx XXX 2002]
*) Let BN_rand_range() abort with an error after 100 iterations
without success (which indicates a broken PRNG).
[Bodo Moeller]
*) Change BN_mod_sqrt() so that it verifies that the input value *) Change BN_mod_sqrt() so that it verifies that the input value
is really the square of the return value. (Previously, is really the square of the return value. (Previously,
BN_mod_sqrt would show GIGO behaviour.) BN_mod_sqrt would show GIGO behaviour.)

14
crypto/bn/bn_rand.c
View File

@ -230,6 +230,7 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
{ {
int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand; int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
int n; int n;
int count = 100;
if (range->neg || BN_is_zero(range)) if (range->neg || BN_is_zero(range))
{ {
@ -263,6 +264,13 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
if (BN_cmp(r, range) >= 0) if (BN_cmp(r, range) >= 0)
if (!BN_sub(r, r, range)) return 0; if (!BN_sub(r, r, range)) return 0;
} }
if (!--count)
{
BNerr(BN_F_BN_RAND_RANGE, BN_R_TOO_MANY_ITERATIONS);
return 0;
}
} }
while (BN_cmp(r, range) >= 0); while (BN_cmp(r, range) >= 0);
} }
@ -272,6 +280,12 @@ static int bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
{ {
/* range = 11..._2 or range = 101..._2 */ /* range = 11..._2 or range = 101..._2 */
if (!bn_rand(r, n, -1, 0)) return 0; if (!bn_rand(r, n, -1, 0)) return 0;
if (!--count)
{
BNerr(BN_F_BN_RAND_RANGE, BN_R_TOO_MANY_ITERATIONS);
return 0;
}
} }
while (BN_cmp(r, range) >= 0); while (BN_cmp(r, range) >= 0);
} }