Flatten structure of libcrypto/bn tests

The bn tests were distributed into three subdirectories rather randomly.
It's cleaner and easier to maintain if all this is in a single directory.
Use consistent names for the .c files, unify handling of the tests with
the exception of bn_test, which is special.

Discussed with jsing

15 files changed, 62 insertions, 116 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>
diff --git a/src/regress/lib/libcrypto/bn/addsub/Makefile b/src/regress/lib/libcrypto/bn/addsub/Makefile
deleted file mode 100644
index 382e776716..0000000000
--- a/src/regress/lib/libcrypto/bn/addsub/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2022/06/19 17:08:19 tb Exp $
-
-.include "../../Makefile.inc"
-
-PROG=           bnaddsub
-LDADD=          ${LIBCRYPTO}
-DPADD=          ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/addsub/bnaddsub.c b/src/regress/lib/libcrypto/bn/bn_add_sub.c
index e23821ed2b..f13129a000 100644
--- a/src/regress/lib/libcrypto/bn/addsub/bnaddsub.c
+++ b/src/regress/lib/libcrypto/bn/bn_add_sub.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bnaddsub.c,v 1.3 2018/07/23 17:15:21 tb Exp $ */
+/*      $OpenBSD: bn_add_sub.c,v 1.1 2022/12/01 20:50:10 tb Exp $       */
 /*
  * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/general/bn_isqrt.c b/src/regress/lib/libcrypto/bn/bn_isqrt.c
index b0ec80b939..a730322082 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_isqrt.c
+++ b/src/regress/lib/libcrypto/bn/bn_isqrt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_isqrt.c,v 1.9 2022/12/01 13:49:12 tb Exp $ */
+/*      $OpenBSD: bn_isqrt.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/general/bn_mod_exp2_mont.c b/src/regress/lib/libcrypto/bn/bn_mod_exp2_mont.c
index f0ebfcbac1..0fa2b960df 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_mod_exp2_mont.c
+++ b/src/regress/lib/libcrypto/bn/bn_mod_exp2_mont.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_mod_exp2_mont.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */
+/*      $OpenBSD: bn_mod_exp2_mont.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/general/bn_mod_sqrt.c b/src/regress/lib/libcrypto/bn/bn_mod_sqrt.c
index 71e27a36e1..e193755b74 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_mod_sqrt.c
+++ b/src/regress/lib/libcrypto/bn/bn_mod_sqrt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_mod_sqrt.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */
+/*      $OpenBSD: bn_mod_sqrt.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/mont/mont.c b/src/regress/lib/libcrypto/bn/bn_mont.c
index 8b9b14a20e..d7c8f9581d 100644
--- a/src/regress/lib/libcrypto/bn/mont/mont.c
+++ b/src/regress/lib/libcrypto/bn/bn_mont.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mont.c,v 1.6 2022/01/14 09:32:27 tb Exp $     */
+/*      $OpenBSD: bn_mont.c,v 1.1 2022/12/01 20:50:10 tb Exp $  */
 
 /*
  * Copyright (c) 2014 Miodrag Vallat.
diff --git a/src/regress/lib/libcrypto/bn/general/bn_primes.c b/src/regress/lib/libcrypto/bn/bn_primes.c
index e637932ccc..e9a91ba87a 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_primes.c
+++ b/src/regress/lib/libcrypto/bn/bn_primes.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_primes.c,v 1.4 2022/12/01 14:32:06 tb Exp $ */
+/*      $OpenBSD: bn_primes.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c b/src/regress/lib/libcrypto/bn/bn_rand_interval.c
index 8cd552734c..032edfb497 100644
--- a/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c
+++ b/src/regress/lib/libcrypto/bn/bn_rand_interval.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_rand_interval.c,v 1.6 2022/12/01 13:49:12 tb Exp $ */
+/*      $OpenBSD: bn_rand_interval.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 /*
  * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/general/bntest.c b/src/regress/lib/libcrypto/bn/bn_test.c
index b9581a0cd9..c1feddeda1 100644
--- a/src/regress/lib/libcrypto/bn/general/bntest.c
+++ b/src/regress/lib/libcrypto/bn/bn_test.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bntest.c,v 1.25 2022/09/05 21:06:31 tb Exp $  */
+/*      $OpenBSD: bn_test.c,v 1.1 2022/12/01 20:50:10 tb Exp $  */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/src/regress/lib/libcrypto/bn/general/bn_to_string.c b/src/regress/lib/libcrypto/bn/bn_to_string.c
index 901fa98610..ca5ca2f08d 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_to_string.c
+++ b/src/regress/lib/libcrypto/bn/bn_to_string.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_to_string.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */
+/*      $OpenBSD: bn_to_string.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 /*
  * Copyright (c) 2019 Theo Buehler <tb@openbsd.org>
  *
diff --git a/src/regress/lib/libcrypto/bn/general/bn_unit.c b/src/regress/lib/libcrypto/bn/bn_unit.c
index f2b3652f88..b4e4a776de 100644
--- a/src/regress/lib/libcrypto/bn/general/bn_unit.c
+++ b/src/regress/lib/libcrypto/bn/bn_unit.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_unit.c,v 1.6 2022/12/01 13:49:12 tb Exp $ */
+/*      $OpenBSD: bn_unit.c,v 1.1 2022/12/01 20:50:10 tb Exp $ */
 
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
diff --git a/src/regress/lib/libcrypto/bn/general/Makefile b/src/regress/lib/libcrypto/bn/general/Makefile
deleted file mode 100644
index 22f3e3f95f..0000000000
--- a/src/regress/lib/libcrypto/bn/general/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#       $OpenBSD: Makefile,v 1.16 2022/11/22 08:56:33 tb Exp $
-
-.include "../../Makefile.inc"
-
-PROGS +=        bntest
-PROGS +=        bn_isqrt
-PROGS +=        bn_mod_exp2_mont
-PROGS +=        bn_mod_sqrt
-PROGS +=        bn_primes
-PROGS +=        bn_to_string
-PROGS +=        bn_unit
-
-DPADD +=        ${LIBCRYPTO}
-LDFLAGS +=      -lcrypto
-WARNINGS =      Yes
-CFLAGS +=       -Werror
-CFLAGS +=       -I${.CURDIR}/../../../../../lib/libcrypto/bn/
-CLEANFILES =    bntest.out bc.out
-
-LDADD_bntest = ${CRYPTO_INT}
-REGRESS_TARGETS += run-bntest
-run-bntest bntest.out: bntest
-        ./bntest -out bntest.out
-
-REGRESS_TARGETS += run-bc
-run-bc: bntest.out
-        bc < bntest.out | tee bc.out | grep -v '^0$$'
-        ! grep -v '^test ' <bc.out | grep -v '^0$$'
-
-REGRESS_TARGETS += run-bn_mod_exp2_mont
-run-bn_mod_exp2_mont: bn_mod_exp2_mont
-        ./bn_mod_exp2_mont
-
-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
-
-LDADD_bn_to_string = ${CRYPTO_INT}
-REGRESS_TARGETS += run-bn_to_string
-run-bn_to_string: bn_to_string
-        ./bn_to_string
-
-REGRESS_TARGETS += run-bn_unit
-run-bn_unit: bn_unit
-        ./bn_unit
-
-
-LDADD_bn_isqrt = ${CRYPTO_INT}
-REGRESS_TARGETS += run-bn_isqrt
-run-bn_isqrt: bn_isqrt
-        ./bn_isqrt
-
-print-tables: bn_isqrt
-        @./bn_isqrt -C
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/mont/Makefile b/src/regress/lib/libcrypto/bn/mont/Makefile
deleted file mode 100644
index 55c48220d4..0000000000
--- a/src/regress/lib/libcrypto/bn/mont/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2017/01/21 09:38:58 beck Exp $
-
-PROG=   mont
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/rand/Makefile b/src/regress/lib/libcrypto/bn/rand/Makefile
deleted file mode 100644
index 52d0835df4..0000000000
--- a/src/regress/lib/libcrypto/bn/rand/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2018/11/06 06:55:27 tb Exp $
-
-.include "../../Makefile.inc"
-
-PROG=   bn_rand_interval
-LDADD=  ${CRYPTO_INT}
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>