From: Pauli <pauli@openssl.org>
Date: Tue, 8 Nov 2022 22:54:02 +0000 (+1100)
Subject: Revert "Remove conditional FIPS dependence for 3DES"
X-Git-Tag: openssl-3.2.0-alpha1~1770
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccc860a77e542bee24f64e44f7bcea5706068866;p=thirdparty%2Fopenssl.git

Revert "Remove conditional FIPS dependence for 3DES"

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)
---

diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c
index bb313282140..2448c35a149 100644
--- a/test/evp_libctx_test.c
+++ b/test/evp_libctx_test.c
@@ -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;
 }