diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2021-01-14 14:43:11 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-21 18:08:02 +0100 |
| commit | f23e4a17a2309793a0ac787725736f1c4474c804 (patch) | |
| tree | e449cb58462d714eddd2ea51ece55a8f43d8223d /test | |
| parent | 6d9a54c6e661094c0668f0307213789c2d9be3ec (diff) | |
Fixes related to broken DH support in CMS
- DH support should work with both DH and DHX keys
- UKM parameter is optional so it can have length 0
Fixes #13810
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13869)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_cms.t | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t index 6783897139..005e9879ae 100644 --- a/test/recipes/80-test_cms.t +++ b/test/recipes/80-test_cms.t @@ -598,7 +598,7 @@ my @smime_cms_param_tests = ( "-stream", "-out", "{output}.cms", "-recip", catfile($smdir, "smec1.pem"), "-aes-128-gcm", "-keyopt", "ecdh_kdf_md:sha256" ], [ "{cmd2}", "-decrypt", "-recip", catfile($smdir, "smec1.pem"), - "-in", "{output}.cms", "-out", "{output}.txt" ], + "-in", "{output}.cms", "-out", "{output}.txt" ], \&final_compare ], @@ -610,18 +610,16 @@ my @smime_cms_param_tests = ( [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smec2.pem"), "-in", "{output}.cms", "-out", "{output}.txt" ], \&final_compare - ] + ], - # TODO(3.0) Add this test back in when "dhpublicnumber" is supported - # in the keymanger. - #[ "enveloped content test streaming S/MIME format, X9.42 DH", - # [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, - # "-stream", "-out", "{output}.cms", - # "-recip", catfile($smdir, "smdh.pem"), "-aes128" ], - # [ "{cmd2}", "-decrypt", "-recip", catfile($smdir, "smdh.pem"), - # "-in", "{output}.cms", "-out", "{output}.txt" ], - # \&final_compare - #] + [ "enveloped content test streaming S/MIME format, X9.42 DH", + [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, + "-stream", "-out", "{output}.cms", + "-recip", catfile($smdir, "smdh.pem"), "-aes128" ], + [ "{cmd2}", "-decrypt", "-recip", catfile($smdir, "smdh.pem"), + "-in", "{output}.cms", "-out", "{output}.txt" ], + \&final_compare + ] ); my @contenttype_cms_test = ( |