]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
endecode_test.c: Fix !fips v3.0.0 check
authorPauli <ppzgs1@gmail.com>
Fri, 30 Aug 2024 01:43:29 +0000 (11:43 +1000)
committerTomas Mraz <tomas@openssl.org>
Fri, 30 Aug 2024 09:42:40 +0000 (11:42 +0200)
The fips_provider_version_* functions return true if the FIPS provider isn't
loaded.  This is somewhat counterintuitive and the fix in #25327 neglected
this nuance resulting in not running the SM2 tests when the FIPS provider
wasn't being loaded.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25331)

test/endecode_test.c

index 8e7dc7a9eca1a6324e9dca7be5bb38230045ebc0..bd28870a1b09fc2784ff2df4b8e15c98d74ce7f3 100644 (file)
@@ -1341,9 +1341,7 @@ int setup_tests(void)
     }
 
     /* FIPS(3.0.0): provider imports explicit params but they won't work #17998 */
-    is_fips_3_0_0 = fips_provider_version_eq(testctx, 3, 0, 0);
-    if (is_fips_3_0_0 < 0)
-        return 0;
+    is_fips_3_0_0 = is_fips && fips_provider_version_eq(testctx, 3, 0, 0);
 
 #ifdef STATIC_LEGACY
     /*