diff options
author | Matt Caswell <matt@openssl.org> | 2019-12-18 11:00:42 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-12-23 10:29:14 +0000 |
commit | b885981ed745106e530139af94c930e84c4a1baa (patch) | |
tree | efb054c93d1bee289cfe95502850d6565b35b8f6 /test/evp_extra_test.c | |
parent | 2b2faf730a8f8f997e1bc74fad35db39d5425930 (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)
(cherry picked from commit 501fcfb8cfc1aa114ffde437039c2dc2827554ae)
Diffstat (limited to 'test/evp_extra_test.c')
-rw-r--r-- | test/evp_extra_test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 2ca78a921f..a74f6332ac 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -1136,6 +1136,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; @@ -1170,6 +1171,7 @@ static int test_EVP_PKEY_set1_DH(void) return ret; } +#endif int setup_tests(void) { @@ -1203,7 +1205,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; } |