From: Pauli <pauli@openssl.org>
Date: Wed, 26 Oct 2022 00:47:48 +0000 (+1100)
Subject: Remove DES cipher from the FIPS provider
X-Git-Tag: openssl-3.2.0-alpha1~1814
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc0bb3411bd0c6ca264f610303933d0bf4f4682c;p=thirdparty%2Fopenssl.git

Remove DES cipher from the FIPS provider

Co-authored-by: Randall Steck <rsteck@thinqsoft.com>
Co-authored-by: Mark J. Minnoch <mark@keypair.us>
Co-authored-by: Steve Weymann <steve@keypair.us>

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/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 6020474a21d..19292fa9923 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -318,10 +318,6 @@ static const OSSL_ALGORITHM_CAPABLE fips_ciphers[] = {
          ossl_cipher_capable_aes_cbc_hmac_sha256),
     ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA256, ossl_aes256cbc_hmac_sha256_functions,
          ossl_cipher_capable_aes_cbc_hmac_sha256),
-#ifndef OPENSSL_NO_DES
-    ALG(PROV_NAMES_DES_EDE3_ECB, ossl_tdes_ede3_ecb_functions),
-    ALG(PROV_NAMES_DES_EDE3_CBC, ossl_tdes_ede3_cbc_functions),
-#endif  /* OPENSSL_NO_DES */
     { { NULL, NULL, NULL }, NULL }
 };
 static OSSL_ALGORITHM exported_fips_ciphers[OSSL_NELEM(fips_ciphers)];