From: Pauli <pauli@openssl.org>
Date: Thu, 22 Sep 2022 03:44:35 +0000 (+1000)
Subject: Remove conditional FIPS dependence for 3DES
X-Git-Tag: openssl-3.2.0-alpha1~1816
X-Git-Url: https://git.openssl.org/?a=commitdiff_plain;h=464c1011b02936850fc779739013dba52650840a;p=openssl.git

Remove conditional FIPS dependence for 3DES

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

diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c
index 2448c35a14..bb31328214 100644
--- a/test/evp_libctx_test.c
+++ b/test/evp_libctx_test.c
@@ -745,8 +745,14 @@ 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
-    ADD_TEST(test_cipher_tdes_randkey);
+    if (!OSSL_PROVIDER_available(libctx, "fips"))
+        ADD_TEST(test_cipher_tdes_randkey);
 #endif
     return 1;
 }