From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 29 Aug 2024 16:42:14 +0000 (+0200)
Subject: endecode_test.c: Avoid running the SM2 tests with 3.0.0 FIPS provider
X-Git-Tag: openssl-3.1.7~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67f43a5bf4e59460f4328956f007b39265c28816;p=thirdparty%2Fopenssl.git

endecode_test.c: Avoid running the SM2 tests with 3.0.0 FIPS provider

Fixes #25326

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25327)

(cherry picked from commit 0b97a5505efa8833bb7b8cabae45894ad6d910a2)
---

diff --git a/test/endecode_test.c b/test/endecode_test.c
index 97576cedc74..8e7dc7a9eca 100644
--- a/test/endecode_test.c
+++ b/test/endecode_test.c
@@ -1451,7 +1451,10 @@ int setup_tests(void)
         ADD_TEST_SUITE_LEGACY(ECExplicitTri2G);
 # endif
 # ifndef OPENSSL_NO_SM2
-        ADD_TEST_SUITE(SM2);
+        if (!is_fips_3_0_0) {
+            /* 3.0.0 FIPS provider imports explicit EC params and then fails. */
+            ADD_TEST_SUITE(SM2);
+        }
 # endif
         ADD_TEST_SUITE(ED25519);
         ADD_TEST_SUITE(ED448);