From: Pauli <pauli@openssl.org>
Date: Thu, 22 Sep 2022 00:53:11 +0000 (+1000)
Subject: Skip DES based tests in FIPS mode
X-Git-Tag: openssl-3.2.0-alpha1~1818
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5db2b4a292b4576185287a9e01e4ba4098b4aa66;p=thirdparty%2Fopenssl.git

Skip DES based tests in FIPS mode

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/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index e10e0860059..6761162d68e 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -370,28 +370,31 @@ my @smime_cms_tests = (
       \&final_compare
     ],
 
-    [ "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
     ],
+);
 
-    [ "encrypted content test streaming PEM format, 128 bit AES key",
+# FIPS 140-3: DES is unavailable
+push @smime_cms_tests, (
+    [ "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
     ],
-);
+) if $no_fips;
 
 my @smime_cms_cades_tests = (