Skip to content

Commit

Permalink
Revert "Skip DES based tests in FIPS mode"
Browse files Browse the repository at this point in the history
This reverts commit 5db2b4a.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #19631)

(cherry picked from commit 75fcf10)
  • Loading branch information
paulidale authored and t8m committed Nov 10, 2022
1 parent a7fb082 commit 78a4827
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions test/recipes/80-test_cms.t
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (

Expand Down

0 comments on commit 78a4827

Please sign in to comment.