From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 10 Aug 2017 15:36:37 +0000 (+0100)
Subject: no-ec2m fixes
X-Git-Tag: OpenSSL_1_1_1-pre1~865
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed5c7ea250657796517fef035e162b20eb8d3c7f;p=oweals%2Fopenssl.git

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 4dae6601c2..ca0b8e3648 100644
--- 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 b6264494f9..f038bea31d 100644
--- 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" ]
     ],