generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ECDH detection, add ECDH keyid test.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 9fdbc9df76a68a30df349c53f1ceeb915f82948c)
This commit is contained in:
Dr. Stephen Henson 2015-04-10 02:31:16 +01:00
parent 42802a94be
commit 784f155e0d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/cms-test.pl
View File

@ -128,7 +128,7 @@ else
die "Error checking for EC2M support\n"; die "Error checking for EC2M support\n";
} }
system ("$ossl_path no-ecdh > $null_path"); system ("$ossl_path no-ec > $null_path");
if ($? == 0) if ($? == 0)
{ {
$no_ecdh = 1; $no_ecdh = 1;
@ -452,6 +452,14 @@ my @smime_cms_param_tests = (
"-decrypt -recip $smdir/smec1.pem -in test.cms -out smtst.txt" "-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", "enveloped content test streaming S/MIME format, ECDH, AES128, SHA256 KDF",
"-encrypt -in smcont.txt" "-encrypt -in smcont.txt"