diff options
author | Matt Caswell <matt@openssl.org> | 2021-01-21 09:19:16 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2021-01-22 09:47:59 +0000 |
commit | 8a9394c1eddbac210d4a2dceab521efa7518fa1f (patch) | |
tree | 91adf5d1454c9435f80a198a208429ef61e1d0ea /test | |
parent | fc52ae8c4b4a00c7158549510ace0e5beef2306b (diff) |
Fix no-dh and no-dsa
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13915)
Diffstat (limited to 'test')
-rw-r--r-- | test/evp_extra_test.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 37efbd42e2..4358fbe5c5 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) |