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)

diff --git a/test/bntest.c b/test/bntest.c
index 4dae6601c24aa59e3707f99431b290f722839280..ca0b8e3648cd499ab8e70fc6214b1dad38107367 100644 (file)
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -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.

diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index b6264494f92af196536b122167bafcf1fec79c86..f038bea31d5b774ed55ef220ad1f814032c4a39e 100644 (file)
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -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" ]
     ],