diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-04-10 02:31:16 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-04-10 18:52:49 +0100 |
| commit | 784f155e0d39cff1fd6e76e75c07f56ae25ebced (patch) | |
| tree | 7a1ea25edffea822a5478c1e947a0bc9cbbbc86c /test | |
| parent | 42802a94be61c9378ead72bb40f02c8b33f1f6e6 (diff) | |
| download | openssl-new-784f155e0d39cff1fd6e76e75c07f56ae25ebced.tar.gz | |
Fix ECDH detection, add ECDH keyid test.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 9fdbc9df76a68a30df349c53f1ceeb915f82948c)
Diffstat (limited to 'test')
| -rw-r--r-- | test/cms-test.pl | 10 |
1 files changed, 9 insertions, 1 deletions
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; @@ -453,6 +453,14 @@ my @smime_cms_param_tests = ( ], [ +"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" . " -stream -out test.cms" |