1 files changed, 52 insertions, 14 deletions

diff --git a/src/regress/lib/libcrypto/bn/Makefile b/src/regress/lib/libcrypto/bn/Makefile
index 89c8d7861a..971ace1c77 100644
--- a/src/regress/lib/libcrypto/bn/Makefile
+++ b/src/regress/lib/libcrypto/bn/Makefile
@@ -1,20 +1,58 @@
-#       $OpenBSD: Makefile,v 1.7 2022/11/30 02:51:05 jsing Exp $
+#       $OpenBSD: Makefile,v 1.8 2022/12/01 20:50:10 tb Exp $
 
-SUBDIR= \
-        addsub \
-        general \
-        mont \
-        rand
+PROGS +=        bn_add_sub
+PROGS +=        bn_cmp
+PROGS +=        bn_isqrt
+PROGS +=        bn_mod_exp2_mont
+PROGS +=        bn_mod_sqrt
+PROGS +=        bn_mont
+PROGS +=        bn_primes
+PROGS +=        bn_rand_interval
+PROGS +=        bn_to_string
+PROGS +=        bn_unit
 
-PROGS+= bn_cmp
+STATIC_LINK +=  bn_isqrt
+STATIC_LINK +=  bn_primes
+STATIC_LINK +=  bn_to_string
+STATIC_LINK +=  bn_rand_interval
 
-LDADD=          -lcrypto
-DPADD=          ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Wall -Wundef -Werror
+LDADD =         -lcrypto
+DPADD =         ${LIBCRYPTO}
+WARNINGS =      Yes
+CFLAGS +=       -Wall -Wundef -Werror
+CFLAGS +=       -I${.CURDIR}/../../../../lib/libcrypto/bn/
 
-REGRESS_TARGETS += run-bn_cmp
-run-bn_cmp: bn_cmp
-        ./bn_cmp
+.for p in ${PROGS}
+REGRESS_TARGETS +=      run-$p
+.PHONY +=               run-$p
+
+run-$p: $p
+        ./$p
+.endfor
+
+isqrt-print-tables: bn_isqrt
+        @./bn_isqrt -C
+
+# Keep bn_test last since it is special
+PROGS +=        bn_test
+STATIC_LINK +=  bn_test
+CLEANFILES +=   bn_test.out bc.out
+
+REGRESS_TARGETS +=      run-bn_test
+.PHONY:                 run-bn_test
+run-bn_test bntest.out: bn_test
+        ./bn_test -out bn_test.out
+
+REGRESS_TARGETS +=      run-bc
+.PHONY:                 run-bc
+run-bc: bn_test.out
+        bc < $> | tee bc.out | grep -v '^0$$'
+        ! grep -v '^test ' <bc.out | grep -v '^0$$'
+
+.for p in ${STATIC_LINK}
+LDADD_$p +=     ${CRYPTO_INT}
+.endfor
+
+.PHONY: isqrt-print-tables
 
 .include <bsd.regress.mk>