From: Matt Caswell <matt@openssl.org>
Date: Thu, 21 Jan 2021 09:19:16 +0000 (+0000)
Subject: Fix no-dh and no-dsa
X-Git-Tag: openssl-3.0.0-alpha11~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a9394c1eddbac210d4a2dceab521efa7518fa1f;p=thirdparty%2Fopenssl.git

Fix no-dh and no-dsa

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13915)
---

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 37efbd42e2b..4358fbe5c5b 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -485,9 +485,9 @@ err:
     return res;
 }
 
-#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DSA)
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_DSA)
 /*
- * Test combinations of private, public, missing and private + public key 
+ * Test combinations of private, public, missing and private + public key
  * params to ensure they are all accepted
  */
 static int test_EVP_PKEY_ffc_priv_pub(char *keytype)
@@ -612,7 +612,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype)
 
     return ret;
 }
-#endif /* !OPENSSL_NO_DH && !OPENSSL_NO_DSA */
+#endif /* !OPENSSL_NO_DH || !OPENSSL_NO_DSA */
 
 static int test_EVP_Enveloped(void)
 {
@@ -1854,7 +1854,7 @@ static int test_DSA_get_set_params(void)
 }
 
 /*
- * Test combinations of private, public, missing and private + public key 
+ * Test combinations of private, public, missing and private + public key
  * params to ensure they are all accepted
  */
 static int test_DSA_priv_pub(void)
@@ -1979,7 +1979,7 @@ static int test_decrypt_null_chunks(void)
 
 #ifndef OPENSSL_NO_DH
 /*
- * Test combinations of private, public, missing and private + public key 
+ * Test combinations of private, public, missing and private + public key
  * params to ensure they are all accepted
  */
 static int test_DH_priv_pub(void)