1 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/libcrypto/bn/bn_prime.c b/src/lib/libcrypto/bn/bn_prime.c
index c2fd0fc2e9..b8f0eb69ce 100644
--- a/src/lib/libcrypto/bn/bn_prime.c
+++ b/src/lib/libcrypto/bn/bn_prime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_prime.c,v 1.31 2023/04/25 19:57:59 tb Exp $ */
+/* $OpenBSD: bn_prime.c,v 1.32 2023/05/10 12:21:55 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -195,12 +195,12 @@ BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
                 goto err;
 
         if (!safe) {
-                if (!bn_is_prime_bpsw(&is_prime, ret, ctx))
+                if (!bn_is_prime_bpsw(&is_prime, ret, ctx, 1))
                         goto err;
                 if (!is_prime)
                         goto loop;
         } else {
-                if (!bn_is_prime_bpsw(&is_prime, ret, ctx))
+                if (!bn_is_prime_bpsw(&is_prime, ret, ctx, 1))
                         goto err;
                 if (!is_prime)
                         goto loop;
@@ -213,7 +213,7 @@ BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
                 if (!BN_rshift1(p, ret))
                         goto err;
 
-                if (!bn_is_prime_bpsw(&is_prime, p, ctx))
+                if (!bn_is_prime_bpsw(&is_prime, p, ctx, 1))
                         goto err;
                 if (!is_prime)
                         goto loop;
@@ -243,8 +243,14 @@ BN_is_prime_fasttest_ex(const BIGNUM *a, int checks, BN_CTX *ctx_passed,
 {
         int is_prime;
 
+        if (checks < 0)
+                return -1;
+
+        if (checks == BN_prime_checks)
+                checks = BN_prime_checks_for_size(BN_num_bits(a));
+
         /* XXX - tickle BN_GENCB in bn_is_prime_bpsw(). */
-        if (!bn_is_prime_bpsw(&is_prime, a, ctx_passed))
+        if (!bn_is_prime_bpsw(&is_prime, a, ctx_passed, checks))
                 return -1;
 
         return is_prime;