From 784f155e0d39cff1fd6e76e75c07f56ae25ebced Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 10 Apr 2015 02:31:16 +0100 Subject: [PATCH] Fix ECDH detection, add ECDH keyid test. Reviewed-by: Rich Salz (cherry picked from commit 9fdbc9df76a68a30df349c53f1ceeb915f82948c) --- test/cms-test.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/cms-test.pl b/test/cms-test.pl index 51abeef2c9..baa3b5948a 100644 --- a/test/cms-test.pl +++ b/test/cms-test.pl @@ -128,7 +128,7 @@ else die "Error checking for EC2M support\n"; } -system ("$ossl_path no-ecdh > $null_path"); +system ("$ossl_path no-ec > $null_path"); if ($? == 0) { $no_ecdh = 1; @@ -452,6 +452,14 @@ my @smime_cms_param_tests = ( "-decrypt -recip $smdir/smec1.pem -in test.cms -out smtst.txt" ], + [ +"enveloped content test streaming S/MIME format, ECDH, key identifier", + "-encrypt -keyid -in smcont.txt" + . " -stream -out test.cms" + . " -recip $smdir/smec1.pem", + "-decrypt -recip $smdir/smec1.pem -in test.cms -out smtst.txt" + ], + [ "enveloped content test streaming S/MIME format, ECDH, AES128, SHA256 KDF", "-encrypt -in smcont.txt" -- 2.25.1