[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  75c4827dfe6f52ccd687a283e6108a88ba3b8ec4 (commit)
      from  633d49c7b486ab7cba9408fd02bcaaad3b8d8f1e (commit)


- Log -----------------------------------------------------------------
commit 75c4827dfe6f52ccd687a283e6108a88ba3b8ec4
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Jun 1 22:51:33 2015 +0200

    gcm.c: address linker warning about OPENSSL_ia32cap_P size mismatch.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/modes/gcm128.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 02e8f2e..f28e07c 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -682,7 +682,7 @@ static void gcm_gmult_1bit(u64 Xi[2], const u64 H[2])
          defined(_M_IX86)       || defined(_M_AMD64)    || defined(_M_X64))
 #  define GHASH_ASM_X86_OR_64
 #  define GCM_FUNCREF_4BIT
-extern unsigned int OPENSSL_ia32cap_P[2];
+extern unsigned int OPENSSL_ia32cap_P[];
 
 void gcm_init_clmul(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_clmul(u64 Xi[2], const u128 Htable[16]);