From 5ae54dbac17b1408f70dfc273cd467734d065767 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 2 Dec 2020 12:03:31 +0000 Subject: [PATCH] Fix sslapitest.c if built with no-legacy We skip a test that uses the no-legacy option. Unfortuantely there is no OPENSSL_NO_LEGACY to test, so we just check whether we were successful in loading the legacy provider - and if not we skip the test. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/13595) --- test/sslapitest.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/sslapitest.c b/test/sslapitest.c index 6683fccbedb..915387a87c6 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -7972,9 +7972,18 @@ static int test_pluggable_group(int idx) OSSL_PROVIDER *legacyprov = OSSL_PROVIDER_load(libctx, "legacy"); const char *group_name = idx == 0 ? "xorgroup" : "xorkemgroup"; - if (!TEST_ptr(tlsprov) || !TEST_ptr(legacyprov)) + if (!TEST_ptr(tlsprov)) goto end; + if (legacyprov == NULL) { + /* + * In this case we assume we've been built with "no-legacy" and skip + * this test (there is no OPENSSL_NO_LEGACY) + */ + testresult = 1; + goto end; + } + if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), TLS_client_method(), TLS1_3_VERSION, -- 2.47.2