From: Pauli <pauli@openssl.org>
Date: Wed, 9 Nov 2022 00:31:50 +0000 (+1100)
Subject: Revert "Skip DES based tests in FIPS mode"
X-Git-Tag: openssl-3.2.0-alpha1~1769
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75fcf1062817421d8c5850ad0d52a913a2e6499a;p=thirdparty%2Fopenssl.git

Revert "Skip DES based tests in FIPS mode"

This reverts commit 5db2b4a292b4576185287a9e01e4ba4098b4aa66.

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/80-test_cms.t b/test/recipes/80-test_cms.t
index 6761162d68e..e10e0860059 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -370,31 +370,28 @@ my @smime_cms_tests = (
       \&final_compare
     ],
 
-    [ "encrypted content test streaming PEM format, 128 bit AES key",
+    [ "encrypted content test streaming PEM format, triple DES key",
       [ "{cmd1}", @prov, "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
-        "-aes128", "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-des3", "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
         "-stream", "-out", "{output}.cms" ],
       [ "{cmd2}", @prov, "-EncryptedData_decrypt", "-in", "{output}.cms",
         "-inform", "PEM",
-        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
         "-out", "{output}.txt" ],
       \&final_compare
     ],
-);
 
-# FIPS 140-3: DES is unavailable
-push @smime_cms_tests, (
-    [ "encrypted content test streaming PEM format, triple DES key",
+    [ "encrypted content test streaming PEM format, 128 bit AES key",
       [ "{cmd1}", @prov, "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
-        "-des3", "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
+        "-aes128", "-secretkey", "000102030405060708090A0B0C0D0E0F",
         "-stream", "-out", "{output}.cms" ],
       [ "{cmd2}", @prov, "-EncryptedData_decrypt", "-in", "{output}.cms",
         "-inform", "PEM",
-        "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
         "-out", "{output}.txt" ],
       \&final_compare
     ],
-) if $no_fips;
+);
 
 my @smime_cms_cades_tests = (