1 files changed, 79 insertions, 36 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24e6f2e..6fea2eb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS += -DLIBRESSL_CRYPTO_INTERNAL
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/bio
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/bn
+AM_CPPFLAGS += -I $(top_srcdir)/crypto/curve25519
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/evp
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509
@@ -40,6 +41,11 @@ EXTRA_DIST += aes_256_gcm_tests.txt
 EXTRA_DIST += chacha20_poly1305_tests.txt
 EXTRA_DIST += xchacha20_poly1305_tests.txt
 
+# aes
+TESTS += aes_test
+check_PROGRAMS += aes_test
+aes_test_SOURCES = aes_test.c
+
 # aes_wrap
 TESTS += aes_wrap
 check_PROGRAMS += aes_wrap
@@ -109,29 +115,56 @@ TESTS += base64test
 check_PROGRAMS += base64test
 base64test_SOURCES = base64test.c
 
-# bftest
-TESTS += bftest
-check_PROGRAMS += bftest
-bftest_SOURCES = bftest.c
+# bf_test
+TESTS += bf_test
+check_PROGRAMS += bf_test
+bf_test_SOURCES = bf_test.c
+
+# bio_chain
+TESTS += bio_chain
+check_PROGRAMS += bio_chain
+bio_chain_SOURCES = bio_chain.c
 
-# biotest
-# the BIO tests rely on resolver results that are OS and environment-specific
+# bio_host
+# this test relies on resolver results that are OS and environment-specific
 if ENABLE_EXTRATESTS
-TESTS += biotest
-check_PROGRAMS += biotest
-biotest_SOURCES = biotest.c
+TESTS += bio_host
+check_PROGRAMS += bio_host
+bio_host_SOURCES = bio_host.c
 endif
 
-# bnaddsub
-TESTS += bnaddsub
-check_PROGRAMS += bnaddsub
-bnaddsub_SOURCES = bnaddsub.c
+# bio_mem
+TESTS += bio_mem
+check_PROGRAMS += bio_mem
+bio_mem_SOURCES = bio_mem.c
+
+# bn_add_sub
+TESTS += bn_add_sub
+check_PROGRAMS += bn_add_sub
+bn_add_sub_SOURCES = bn_add_sub.c
+
+# bn_cmp
+TESTS += bn_cmp
+check_PROGRAMS += bn_cmp
+bn_cmp_SOURCES = bn_cmp.c
 
 # bn_isqrt
 TESTS += bn_isqrt
 check_PROGRAMS += bn_isqrt
 bn_isqrt_SOURCES = bn_isqrt.c
 
+# bn_mod_exp
+TESTS += bn_mod_exp
+check_PROGRAMS += bn_mod_exp
+bn_mod_exp_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
+bn_mod_exp_SOURCES = bn_mod_exp.c
+
+# bn_mod_exp_zero
+TESTS += bn_mod_exp_zero
+check_PROGRAMS += bn_mod_exp_zero
+bn_mod_exp_zero_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
+bn_mod_exp_zero_SOURCES = bn_mod_exp_zero.c
+
 # bn_mod_exp2_mont
 TESTS += bn_mod_exp2_mont
 check_PROGRAMS += bn_mod_exp2_mont
@@ -142,6 +175,11 @@ TESTS += bn_mod_sqrt
 check_PROGRAMS += bn_mod_sqrt
 bn_mod_sqrt_SOURCES = bn_mod_sqrt.c
 
+# bn_mont
+TESTS += bn_mont
+check_PROGRAMS += bn_mont
+bn_mont_SOURCES = bn_mont.c
+
 # bn_primes
 TESTS += bn_primes
 check_PROGRAMS += bn_primes
@@ -152,17 +190,22 @@ TESTS += bn_rand_interval
 check_PROGRAMS += bn_rand_interval
 bn_rand_interval_SOURCES = bn_rand_interval.c
 
-# bntest
-TESTS += bntest
-bntest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
-check_PROGRAMS += bntest
-bntest_SOURCES = bntest.c
+# bn_test
+TESTS += bn_test
+bn_test_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
+check_PROGRAMS += bn_test
+bn_test_SOURCES = bn_test.c
 
 # bn_to_string
 TESTS += bn_to_string
 check_PROGRAMS += bn_to_string
 bn_to_string_SOURCES = bn_to_string.c
 
+# bn_unit
+TESTS += bn_unit
+check_PROGRAMS += bn_unit
+bn_unit_SOURCES = bn_unit.c
+
 # buffertest
 TESTS += buffertest
 check_PROGRAMS += buffertest
@@ -234,13 +277,14 @@ TESTS += dsatest
 check_PROGRAMS += dsatest
 dsatest_SOURCES = dsatest.c
 
-# dtlstest
-if !HOST_WIN
-TESTS += dtlstest.sh
-check_PROGRAMS += dtlstest
-dtlstest_SOURCES = dtlstest.c
-endif
-EXTRA_DIST += dtlstest.sh
+# XXX this test is too flaky for CI. Disable it until it is fixed.
+## dtlstest
+#if !HOST_WIN
+#TESTS += dtlstest.sh
+#check_PROGRAMS += dtlstest
+#dtlstest_SOURCES = dtlstest.c
+#endif
+#EXTRA_DIST += dtlstest.sh
 
 # ec_asn1_test
 TESTS += ec_asn1_test
@@ -267,11 +311,21 @@ TESTS += ectest
 check_PROGRAMS += ectest
 ectest_SOURCES = ectest.c
 
+# ed25519test
+TESTS += ed25519test
+check_PROGRAMS += ed25519test
+ed25519test_SOURCES = ed25519test.c
+
 # enginetest
 TESTS += enginetest
 check_PROGRAMS += enginetest
 enginetest_SOURCES = enginetest.c
 
+# evp_ecx_test
+TESTS += evp_ecx_test
+check_PROGRAMS += evp_ecx_test
+evp_ecx_test_SOURCES = evp_ecx_test.c
+
 # evp_pkey_check
 TESTS += evp_pkey_check
 check_PROGRAMS += evp_pkey_check
@@ -302,12 +356,6 @@ endif
 endif
 endif
 
-# exptest
-TESTS += exptest
-check_PROGRAMS += exptest
-exptest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
-exptest_SOURCES = exptest.c
-
 # freenull
 TESTS += freenull
 check_PROGRAMS += freenull
@@ -365,11 +413,6 @@ TESTS += md_test
 check_PROGRAMS += md_test
 md_test_SOURCES = md_test.c
 
-# mont
-TESTS += mont
-check_PROGRAMS += mont
-mont_SOURCES = mont.c
-
 # objectstest
 TESTS += objectstest
 check_PROGRAMS += objectstest