From: Pauli <pauli@openssl.org>
Date: Tue, 8 Nov 2022 22:53:21 +0000 (+1100)
Subject: Revert "Move DES based test cases out of FIPS territory"
X-Git-Tag: openssl-3.2.0-alpha1~1771
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c69cf38ec4b592a488f0c8d3042ecc345787ffc9;p=thirdparty%2Fopenssl.git

Revert "Move DES based test cases out of FIPS territory"

This reverts commit c511953a0828e126b80a9ea8cee12d001d685ba8.

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/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 51db74f5ec7..572f5b1d8ef 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -44,6 +44,7 @@ my @files = qw(
                 evpciph_aes_cts.txt
                 evpciph_aes_wrap.txt
                 evpciph_aes_stitched.txt
+                evpciph_des3_common.txt
                 evpkdf_hkdf.txt
                 evpkdf_kbkdf_counter.txt
                 evpkdf_pbkdf1.txt
@@ -67,6 +68,7 @@ push @files, qw(
                ) unless $no_dh;
 push @files, qw(
                 evpkdf_x942_des.txt
+                evpmac_cmac_des.txt
                ) unless $no_des;
 push @files, qw(evppkey_dsa.txt) unless $no_dsa;
 push @files, qw(evppkey_ecx.txt) unless $no_ec;
@@ -89,7 +91,6 @@ my @defltfiles = qw(
                      evpciph_cast5.txt
                      evpciph_chacha.txt
                      evpciph_des.txt
-                     evpciph_des3_common.txt
                      evpciph_idea.txt
                      evpciph_rc2.txt
                      evpciph_rc4.txt
@@ -101,7 +102,6 @@ my @defltfiles = qw(
                      evpkdf_krb5.txt
                      evpkdf_scrypt.txt
                      evpkdf_tls11_prf.txt
-                     evpmac_cmac_des.txt
                      evpmac_blake.txt
                      evpmac_poly1305.txt
                      evpmac_siphash.txt