From: Todd Short <tshort@akamai.com>
Date: Mon, 19 Mar 2018 18:22:56 +0000 (-0400)
Subject: Fix no-sm3/no-sm2 (with strict-warnings)
X-Git-Tag: OpenSSL_1_1_1-pre3~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=27df4597316c28a03c73bacb4095e86e41da65bb;p=oweals%2Fopenssl.git

Fix no-sm3/no-sm2 (with strict-warnings)

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5677)
---

diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 46cbe22e05..851e6a4981 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -2751,6 +2751,7 @@ static const struct {
     }
 };
 
+#ifndef OPENSSL_NO_SM2
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 32 * 6];
@@ -2787,6 +2788,7 @@ static const struct {
         0x53, 0xbb, 0xf4, 0x09, 0x39, 0xd5, 0x41, 0x23,
     }
 };
+#endif /* OPENSSL_NO_SM2 */
 
 typedef struct _ec_list_element_st {
     int nid;