From ef05030eda1c8145a5c4c13f83895643d86d3f4c Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 1 Dec 2022 21:21:51 +0000 Subject: [PATCH] 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 --- regress/lib/libcrypto/bn/Makefile | 4 +++- regress/lib/libcrypto/{exp/exptest.c => bn/bn_mod_exp.c} | 2 +- regress/lib/libcrypto/exp/Makefile | 9 --------- 3 files changed, 4 insertions(+), 11 deletions(-) rename regress/lib/libcrypto/{exp/exptest.c => bn/bn_mod_exp.c} (99%) delete mode 100644 regress/lib/libcrypto/exp/Makefile diff --git a/regress/lib/libcrypto/bn/Makefile b/regress/lib/libcrypto/bn/Makefile index 971ace1c774..b5d146c71b4 100644 --- a/regress/lib/libcrypto/bn/Makefile +++ b/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/regress/lib/libcrypto/exp/exptest.c b/regress/lib/libcrypto/bn/bn_mod_exp.c similarity index 99% rename from regress/lib/libcrypto/exp/exptest.c rename to regress/lib/libcrypto/bn/bn_mod_exp.c index 9a7a769e072..337cbd13733 100644 --- a/regress/lib/libcrypto/exp/exptest.c +++ b/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/regress/lib/libcrypto/exp/Makefile b/regress/lib/libcrypto/exp/Makefile deleted file mode 100644 index 890b38e9fe9..00000000000 --- a/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 -- 2.20.1