diff options
| author | Matt Caswell <matt@openssl.org> | 2020-02-01 00:58:53 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-03 11:29:02 +0100 |
| commit | ef071222020be2096fb9f3aaef8bfe18ae9a40c9 (patch) | |
| tree | dd920b4a79c049c6b4a57e690a184ae09fea8b5e /test/cmp_protect_test.c | |
| parent | Revert "Legacy digests can have custom control values" (diff) | |
| download | openssl-ef071222020be2096fb9f3aaef8bfe18ae9a40c9.tar.xz openssl-ef071222020be2096fb9f3aaef8bfe18ae9a40c9.zip | |
Fix no-ec
The cmp_protect_test cert chain tests use some EC certs which breaks in
a no-ec build. The fix is to just skip those tests if no-ec has been
configured.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10991)
Diffstat (limited to 'test/cmp_protect_test.c')
| -rw-r--r-- | test/cmp_protect_test.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c index 89be39f7fc..b349cac2d7 100644 --- a/test/cmp_protect_test.c +++ b/test/cmp_protect_test.c @@ -294,6 +294,8 @@ static int test_MSG_add_extraCerts(void) return result; } +#ifndef OPENSSL_NO_EC +/* The cert chain tests use EC certs so we skip them in no-ec builds */ static int execute_cmp_build_cert_chain_test(CMP_PROTECT_TEST_FIXTURE *fixture) { STACK_OF(X509) *result = NULL; @@ -372,6 +374,7 @@ static int test_cmp_build_cert_chain_no_certs(void) EXECUTE_TEST(execute_cmp_build_cert_chain_test, tear_down); return result; } +#endif /* OPENSSL_NO_EC */ static int execute_X509_STORE_test(CMP_PROTECT_TEST_FIXTURE *fixture) { @@ -505,10 +508,12 @@ int setup_tests(void) ADD_TEST(test_MSG_add_extraCerts); +#ifndef OPENSSL_NO_EC ADD_TEST(test_cmp_build_cert_chain); ADD_TEST(test_cmp_build_cert_chain_missing_root); ADD_TEST(test_cmp_build_cert_chain_missing_intermediate); ADD_TEST(test_cmp_build_cert_chain_no_certs); +#endif ADD_TEST(test_X509_STORE); ADD_TEST(test_X509_STORE_only_self_signed); |