]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
evp_test: recondition cipher dupctx FIPS version check.
authorPauli <pauli@openssl.org>
Thu, 21 Sep 2023 22:46:31 +0000 (08:46 +1000)
committerMatt Caswell <matt@openssl.org>
Wed, 27 Sep 2023 16:23:04 +0000 (17:23 +0100)
Until the cipher dupctx is properly implemented in 3.1 and 3.0 the check is
wrong.  This should be reverted once the implemenation has been done.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21964)

test/evp_test.c

index 309ab94c21b540ae63c85e5c642ffeffc92d09b8..bd1a7cc122f370e811000e36d538ff44ee8f9016 100644 (file)
@@ -739,9 +739,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
     int ok = 0, tmplen, chunklen, tmpflen, i;
     EVP_CIPHER_CTX *ctx_base = NULL;
     EVP_CIPHER_CTX *ctx = NULL, *duped;
-    int fips_dupctx_supported = (fips_provider_version_ge(libctx, 3, 0, 12)
-                                 && fips_provider_version_lt(libctx, 3, 1, 0))
-                                || fips_provider_version_ge(libctx, 3, 1, 4);
+    int fips_dupctx_supported = fips_provider_version_ge(libctx, 3, 2, 0);
 
     t->err = "TEST_FAILURE";
     if (!TEST_ptr(ctx_base = EVP_CIPHER_CTX_new()))