Remove prime_t remnant and link bn_primes test statically

2 files changed, 4 insertions, 3 deletions

diff --git a/src/regress/lib/libcrypto/bn/general/Makefile b/src/regress/lib/libcrypto/bn/general/Makefile
index ab642e0769..b9282a1126 100644
--- a/src/regress/lib/libcrypto/bn/general/Makefile
+++ b/src/regress/lib/libcrypto/bn/general/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.14 2022/07/25 20:48:57 tb Exp $
+#       $OpenBSD: Makefile,v 1.15 2022/11/09 23:28:08 tb Exp $
 
 .include "../../Makefile.inc"
 
@@ -34,6 +34,7 @@ REGRESS_TARGETS += run-bn_mod_sqrt
 run-bn_mod_sqrt: bn_mod_sqrt
         ./bn_mod_sqrt
 
+LDADD_bn_primes = ${CRYPTO_INT}
 REGRESS_TARGETS += run-bn_primes
 run-bn_primes: bn_primes
         ./bn_primes
diff --git a/src/regress/lib/libcrypto/bn/general/bn_primes.c b/src/regress/lib/libcrypto/bn/general/bn_primes.c
index f9d358f709..c61cdb34b8 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_primes.c
+++ b/src/regress/lib/libcrypto/bn/general/bn_primes.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_primes.c,v 1.1 2022/06/18 19:53:19 tb Exp $ */
+/*      $OpenBSD: bn_primes.c,v 1.2 2022/11/09 23:28:08 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
@@ -24,7 +24,7 @@ test_bn_is_prime_fasttest(int do_trial_division)
 {
         BIGNUM *n = NULL;
         char *descr = NULL;
-        prime_t i, j, max;
+        uint16_t i, j, max;
         int is_prime, ret;
         int failed = 1;