diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/bn/bn_prime.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/bn/bn_prime.c b/src/lib/libcrypto/bn/bn_prime.c index f44fbdf79a..bf3f931644 100644 --- a/src/lib/libcrypto/bn/bn_prime.c +++ b/src/lib/libcrypto/bn/bn_prime.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_prime.c,v 1.25 2022/11/09 15:33:13 tb Exp $ */ | 1 | /* $OpenBSD: bn_prime.c,v 1.26 2022/11/09 22:52:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -260,7 +260,7 @@ static int | |||
260 | probable_prime(BIGNUM *rnd, int bits) | 260 | probable_prime(BIGNUM *rnd, int bits) |
261 | { | 261 | { |
262 | int i; | 262 | int i; |
263 | prime_t mods[NUMPRIMES]; | 263 | BN_ULONG mods[NUMPRIMES]; |
264 | BN_ULONG delta, maxdelta; | 264 | BN_ULONG delta, maxdelta; |
265 | 265 | ||
266 | again: | 266 | again: |
@@ -268,10 +268,10 @@ again: | |||
268 | return (0); | 268 | return (0); |
269 | /* we now have a random number 'rand' to test. */ | 269 | /* we now have a random number 'rand' to test. */ |
270 | for (i = 1; i < NUMPRIMES; i++) { | 270 | for (i = 1; i < NUMPRIMES; i++) { |
271 | BN_ULONG mod = BN_mod_word(rnd, (BN_ULONG)primes[i]); | 271 | BN_ULONG mod = BN_mod_word(rnd, primes[i]); |
272 | if (mod == (BN_ULONG)-1) | 272 | if (mod == (BN_ULONG)-1) |
273 | return (0); | 273 | return (0); |
274 | mods[i] = (prime_t)mod; | 274 | mods[i] = mod; |
275 | } | 275 | } |
276 | maxdelta = BN_MASK2 - primes[NUMPRIMES - 1]; | 276 | maxdelta = BN_MASK2 - primes[NUMPRIMES - 1]; |
277 | delta = 0; | 277 | delta = 0; |
@@ -325,7 +325,7 @@ probable_prime_dh(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, | |||
325 | loop: | 325 | loop: |
326 | for (i = 1; i < NUMPRIMES; i++) { | 326 | for (i = 1; i < NUMPRIMES; i++) { |
327 | /* check that rnd is a prime */ | 327 | /* check that rnd is a prime */ |
328 | BN_LONG mod = BN_mod_word(rnd, (BN_ULONG)primes[i]); | 328 | BN_LONG mod = BN_mod_word(rnd, primes[i]); |
329 | if (mod == (BN_ULONG)-1) | 329 | if (mod == (BN_ULONG)-1) |
330 | goto err; | 330 | goto err; |
331 | if (mod <= 1) { | 331 | if (mod <= 1) { |
@@ -390,8 +390,8 @@ loop: | |||
390 | /* check that p and q are prime */ | 390 | /* check that p and q are prime */ |
391 | /* check that for p and q | 391 | /* check that for p and q |
392 | * gcd(p-1,primes) == 1 (except for 2) */ | 392 | * gcd(p-1,primes) == 1 (except for 2) */ |
393 | BN_ULONG pmod = BN_mod_word(p, (BN_ULONG)primes[i]); | 393 | BN_ULONG pmod = BN_mod_word(p, primes[i]); |
394 | BN_ULONG qmod = BN_mod_word(q, (BN_ULONG)primes[i]); | 394 | BN_ULONG qmod = BN_mod_word(q, primes[i]); |
395 | if (pmod == (BN_ULONG)-1 || qmod == (BN_ULONG)-1) | 395 | if (pmod == (BN_ULONG)-1 || qmod == (BN_ULONG)-1) |
396 | goto err; | 396 | goto err; |
397 | if (pmod == 0 || qmod == 0) { | 397 | if (pmod == 0 || qmod == 0) { |