diff options
author | Tomas Mraz <tomas@openssl.org> | 2023-12-19 18:52:12 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2024-01-04 15:38:35 +0100 |
commit | 740786771a05d13eb54f18578e80b205b1c38541 (patch) | |
tree | 286aa8203d59cf5abca6a5171446a451393172d8 | |
parent | d64242fb13d98677a8aaf38adce09f9d92ede166 (diff) |
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 <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/23099)
-rw-r--r-- | test/evp_test.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index e81213e2f8..05fa50b99f 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"; |