From 740786771a05d13eb54f18578e80b205b1c38541 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 19 Dec 2023 18:52:12 +0100 Subject: [PATCH] evp_test.c: Fix provider compat tests CI failure As in the provider compatibility tests we also run the 3.1.2 fips provider against the up-to-date 3.0 branch the CI would still fail as 3.1.2 provider would be expected to pass this check. Update the required fips provider version to be >3.1.4 or <3.1.0 and >3.0.12 instead. Reviewed-by: Neil Horman Reviewed-by: Matt Caswell Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/23099) --- test/evp_test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/evp_test.c b/test/evp_test.c index e81213e2f84..05fa50b99fa 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -1516,7 +1516,9 @@ static int mac_test_run_mac(EVP_TEST *t) t->err = "MAC_CREATE_ERROR"; goto err; } - if (fips_provider_version_gt(libctx, 3, 0, 12)) + if (fips_provider_version_gt(libctx, 3, 1, 4) + || (fips_provider_version_lt(libctx, 3, 1, 0) + && fips_provider_version_gt(libctx, 3, 0, 12))) size_before_init = EVP_MAC_CTX_get_mac_size(ctx); if (!EVP_MAC_init(ctx, expected->key, expected->key_len, params)) { t->err = "MAC_INIT_ERROR"; -- 2.47.2