summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <ppzgs1@gmail.com>2024-08-30 03:43:29 +0200
committerTomas Mraz <tomas@openssl.org>2024-08-30 11:42:40 +0200
commitc6c6af18ea5f8dd7aa2bd54b63fcb813ee6c2394 (patch)
tree9a8466848ee8916a4b48254029be8b6eceea7b62
parentexporters for pkg-config: align with the changes for CMake (diff)
downloadopenssl-c6c6af18ea5f8dd7aa2bd54b63fcb813ee6c2394.tar.xz
openssl-c6c6af18ea5f8dd7aa2bd54b63fcb813ee6c2394.zip
endecode_test.c: Fix !fips v3.0.0 check
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)
-rw-r--r--test/endecode_test.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/endecode_test.c b/test/endecode_test.c
index 8e7dc7a9ec..bd28870a1b 100644
--- a/test/endecode_test.c
+++ b/test/endecode_test.c
@@ -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
/*