regress/libcrypto: merge exp/ into bn/

Move exp/exptest.c to bn/bn_mod_exp.c. This is a BN test that mostly tests
a variety of BN_mod_exp*() API behavior and correctness.

Commit stolen from jsing

3 files changed, 4 insertions, 11 deletions

diff --git a/src/regress/lib/libcrypto/bn/Makefile b/src/regress/lib/libcrypto/bn/Makefile
index 971ace1c77..b5d146c71b 100644
--- a/src/regress/lib/libcrypto/bn/Makefile
+++ b/src/regress/lib/libcrypto/bn/Makefile
@@ -1,8 +1,9 @@
-#       $OpenBSD: Makefile,v 1.8 2022/12/01 20:50:10 tb Exp $
+#       $OpenBSD: Makefile,v 1.9 2022/12/01 21:21:51 tb Exp $
 
 PROGS +=        bn_add_sub
 PROGS +=        bn_cmp
 PROGS +=        bn_isqrt
+PROGS +=        bn_mod_exp
 PROGS +=        bn_mod_exp2_mont
 PROGS +=        bn_mod_sqrt
 PROGS +=        bn_mont
@@ -12,6 +13,7 @@ PROGS +=	bn_to_string
 PROGS +=        bn_unit
 
 STATIC_LINK +=  bn_isqrt
+STATIC_LINK +=  bn_mod_exp
 STATIC_LINK +=  bn_primes
 STATIC_LINK +=  bn_to_string
 STATIC_LINK +=  bn_rand_interval
diff --git a/src/regress/lib/libcrypto/exp/exptest.c b/src/regress/lib/libcrypto/bn/bn_mod_exp.c
index 9a7a769e07..337cbd1373 100644
--- a/src/regress/lib/libcrypto/exp/exptest.c
+++ b/src/regress/lib/libcrypto/bn/bn_mod_exp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: exptest.c,v 1.10 2022/12/01 21:13:58 tb Exp $ */
+/*      $OpenBSD: bn_mod_exp.c,v 1.1 2022/12/01 21:21:51 tb Exp $       */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/src/regress/lib/libcrypto/exp/Makefile b/src/regress/lib/libcrypto/exp/Makefile
deleted file mode 100644
index 890b38e9fe..0000000000
--- a/src/regress/lib/libcrypto/exp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2017/01/21 09:38:58 beck Exp $
-
-PROG=   exptest
-LDADD=  ${CRYPTO_INT}
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>