diff options
| author | Pauli <pauli@openssl.org> | 2022-11-09 11:31:50 +1100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-11-10 12:26:28 +0100 |
| commit | 78a4827dad6db9d45b37dde409ea5d6f3f3deeac (patch) | |
| tree | 90f9a56ba68cd216c687c923d0cf6a921d9430f9 /test | |
| parent | a7fb08256d0fbd881f828aa865e6450fdaa9d2b9 (diff) | |
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)
(cherry picked from commit 75fcf1062817421d8c5850ad0d52a913a2e6499a)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_cms.t | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t index b2a4076139..48a92f735d 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 = ( |