From: Todd Short <tshort@akamai.com>
Date: Tue, 9 Jan 2018 15:46:44 +0000 (-0500)
Subject: Fix --strict-warnings with C90
X-Git-Tag: OpenSSL_1_1_1-pre1~204
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8e403a79b0e679c8df41a9686006c5fe052d79bd;p=oweals%2Fopenssl.git

Fix --strict-warnings with C90

Found with gcc 4.8.4

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5045)
---

diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 04e374ebc5..4580f70b24 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -1530,6 +1530,10 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
     BN_ULONG table[15][P256_LIMBS];
     BN_ULONG out[P256_LIMBS], t[P256_LIMBS];
     int i, ret = 0;
+    enum {
+        i_1 = 0, i_10,     i_11,     i_101, i_111, i_1010, i_1111,
+        i_10101, i_101010, i_101111, i_x6,  i_x8,  i_x16,  i_x32
+    };
 
     /*
      * Catch allocation failure early.
@@ -1607,10 +1611,6 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
      * multiplications, 25%, on grand scale sign operation is not that
      * much faster, not more that 2%...
      */
-    enum {
-        i_1 = 0, i_10,     i_11,     i_101, i_111, i_1010, i_1111,
-        i_10101, i_101010, i_101111, i_x6,  i_x8,  i_x16,  i_x32
-    };
 
     /* pre-calculate powers */
     ecp_nistz256_ord_sqr_mont(table[i_10], table[i_1], 1);