Fix evp_extra_test with no-dh
authorMatt Caswell <matt@openssl.org>
Wed, 18 Dec 2019 11:00:42 +0000 (11:00 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 23 Dec 2019 10:22:21 +0000 (10:22 +0000)
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)

test/evp_extra_test.c

index 9368079..387e294 100644 (file)
@@ -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;
 }