From 1f0cb850473048eef5dc597d8cd42dd7c3cf5a5f Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 18 Oct 2024 10:20:45 +0200 Subject: [PATCH] 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 Reviewed-by: Paul Dale Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/25731) --- test/acvp_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/acvp_test.c b/test/acvp_test.c index 646b37884c..944c8c0e48 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();