Fix ECDH detection, add ECDH keyid test.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 9fdbc9df76a68a30df349c53f1ceeb915f82948c)

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 51abeef2c9cb21ba100a99a7998db9a9b306154b..baa3b5948a4428aeccae1e1b1322eed0029d618a 100644 (file)
--- 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"