summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-12-18 11:00:42 +0000
committerMatt Caswell <matt@openssl.org>2019-12-23 10:22:21 +0000
commit501fcfb8cfc1aa114ffde437039c2dc2827554ae (patch)
tree8e7a55265e1e7330f78263c62f418316c04fedce /test
parent390b18a7a2b795b085c39b380e64d0f86b3801e5 (diff)
Fix evp_extra_test with no-dh
The new DH test in evp_extra_test.c broke the no-dh build so we add some guards to fix it. Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/10644)
Diffstat (limited to 'test')
-rw-r--r--test/evp_extra_test.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 93680796ea..387e29496f 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -1413,6 +1413,7 @@ static int test_decrypt_null_chunks(void)
}
#endif /* !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) */
+#ifndef OPENSSL_NO_DH
static int test_EVP_PKEY_set1_DH(void)
{
DH *x942dh, *pkcs3dh;
@@ -1447,6 +1448,7 @@ static int test_EVP_PKEY_set1_DH(void)
return ret;
}
+#endif
int setup_tests(void)
{
@@ -1483,7 +1485,9 @@ int setup_tests(void)
#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
ADD_TEST(test_decrypt_null_chunks);
#endif
+#ifndef OPENSSL_NO_DH
ADD_TEST(test_EVP_PKEY_set1_DH);
+#endif
return 1;
}