[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  55467a16c2baf798ebcb627835654524cf8598a1 (commit)
      from  dc0e9a35fa89c262833d6b498108acc58a70bdcb (commit)


- Log -----------------------------------------------------------------
commit 55467a16c2baf798ebcb627835654524cf8598a1
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jan 27 16:39:13 2015 +0000

    Fix warning on some compilers where variable index shadows a global
    declaration
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/ocb128.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c
index a322410..cbcb7f6 100644
--- a/crypto/modes/ocb128.c
+++ b/crypto/modes/ocb128.c
@@ -151,10 +151,10 @@ static void ocb_block_xor(const unsigned char *in1,
  * Lookup L_index in our lookup table. If we haven't already got it we need to
  * calculate it
  */
-static OCB_BLOCK *ocb_lookup_l(OCB128_CONTEXT *ctx, size_t index)
+static OCB_BLOCK *ocb_lookup_l(OCB128_CONTEXT *ctx, size_t idx)
 {
-    if (index <= ctx->l_index) {
-        return ctx->l + index;
+    if (idx <= ctx->l_index) {
+        return ctx->l + idx;
     }
 
     /* We don't have it - so calculate it */
@@ -166,9 +166,9 @@ static OCB_BLOCK *ocb_lookup_l(OCB128_CONTEXT *ctx, size_t index)
         if (!ctx->l)
             return NULL;
     }
-    ocb_double(ctx->l + (index - 1), ctx->l + index);
+    ocb_double(ctx->l + (idx - 1), ctx->l + idx);
 
-    return ctx->l + index;
+    return ctx->l + idx;
 }
 
 /*