From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 18 Oct 2024 08:20:45 +0000 (+0200)
Subject: ecdh_cofactor_derive_test(): Skip the test if the curve is not supported
X-Git-Tag: openssl-3.5.0-alpha1~980
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f0cb850473048eef5dc597d8cd42dd7c3cf5a5f;p=thirdparty%2Fopenssl.git

ecdh_cofactor_derive_test(): Skip the test if the curve is not supported

It will not be supported if the fips provider was built with no-ec2m.

Fixes #25729

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25731)
---

diff --git a/test/acvp_test.c b/test/acvp_test.c
index 646b37884c4..944c8c0e485 100644
--- a/test/acvp_test.c
+++ b/test/acvp_test.c
@@ -363,8 +363,10 @@ static int ecdh_cofactor_derive_test(int tstid)
     if (!ec_cofactors)
         return TEST_skip("not supported by FIPS provider version");
 
-    if (!TEST_ptr(peer1 = EVP_PKEY_Q_keygen(libctx, NULL, "EC", curve))
-            || !TEST_ptr(peer2 = EVP_PKEY_Q_keygen(libctx, NULL, "EC", curve)))
+    if (!TEST_ptr(peer1 = EVP_PKEY_Q_keygen(libctx, NULL, "EC", curve)))
+        return TEST_skip("Curve %s not supported by the FIPS provider", curve);
+
+    if (!TEST_ptr(peer2 = EVP_PKEY_Q_keygen(libctx, NULL, "EC", curve)))
         goto err;
 
     params[1] = OSSL_PARAM_construct_end();