no-ec2m fixes

Fix warning and don't use binary field certificate for ECDH CMS
key only test.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4134)
This commit is contained in:
Dr. Stephen Henson 2017-08-10 16:36:37 +01:00
parent 1aee92bf0f
commit ed5c7ea250
2 changed files with 4 additions and 3 deletions

View File

@ -59,9 +59,10 @@ static BN_CTX *ctx;
/*
* Polynomial coefficients used in GFM tests.
*/
#ifndef OPENSSL_NO_EC2M
static int p0[] = { 163, 7, 6, 3, 0, -1 };
static int p1[] = { 193, 15, 0, -1 };
#endif
/*
* Look for |key| in the stanza and return it or NULL if not found.

View File

@ -353,8 +353,8 @@ my @smime_cms_param_tests = (
[ "-encrypt", "-in", $smcont,
"-stream", "-out", "test.cms",
catfile($smdir, "smec1.pem"),
catfile($smdir, "smec2.pem") ],
[ "-decrypt", "-inkey", catfile($smdir, "smec2.pem"),
catfile($smdir, "smec3.pem") ],
[ "-decrypt", "-inkey", catfile($smdir, "smec3.pem"),
"-in", "test.cms", "-out", "smtst.txt" ]
],