]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Revert "Remove conditional FIPS dependence for 3DES"
authorPauli <pauli@openssl.org>
Tue, 8 Nov 2022 22:54:02 +0000 (09:54 +1100)
committerTomas Mraz <tomas@openssl.org>
Thu, 10 Nov 2022 11:25:04 +0000 (12:25 +0100)
This reverts commit 464c1011b02936850fc779739013dba52650840a.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19631)

test/evp_libctx_test.c

index bb31328214072eadfea7d440a9f068e2f11f0280..2448c35a149f60892d238e51a7b97857ed8b8628 100644 (file)
@@ -745,14 +745,8 @@ int setup_tests(void)
 #ifndef OPENSSL_NO_DH
     ADD_TEST(kem_invalid_keytype);
 #endif
-    /*
-     * The FIPS provider doesn't have 3DES, so we skip this test if
-     * FIPS is available.  It's not perfect because FIPS + default might be
-     * loaded but it's good enough.
-     */
 #ifndef OPENSSL_NO_DES
-    if (!OSSL_PROVIDER_available(libctx, "fips"))
-        ADD_TEST(test_cipher_tdes_randkey);
+    ADD_TEST(test_cipher_tdes_randkey);
 #endif
     return 1;
 }