]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix sslapitest.c if built with no-legacy
authorMatt Caswell <matt@openssl.org>
Wed, 2 Dec 2020 12:03:31 +0000 (12:03 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 11 Dec 2020 10:56:22 +0000 (10:56 +0000)
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 <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13595)

test/sslapitest.c

index 6683fccbedb86f44dc692b9bf3db4409d4cc3d67..915387a87c699d963711155ff9d13551a34dee5e 100644 (file)
@@ -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,