[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  769adcfe8b27d696d3e221427d82f365919917a8 (commit)
      from  9716b0b9deb68ffe268235841eba80ea4e31a9d0 (commit)


- Log -----------------------------------------------------------------
commit 769adcfe8b27d696d3e221427d82f365919917a8
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Jan 30 19:48:09 2016 -0500

    GH102: Extra volatile avoids GCC bug
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 crypto/cryptlib.c        | 4 +++-
 include/openssl/crypto.h | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 9473799..d317340 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -465,7 +465,9 @@ void OpenSSLDie(const char *file, int line, const char *assertion)
 #endif
 }
 
-int CRYPTO_memcmp(const volatile void *in_a, const volatile void *in_b, size_t len)
+int CRYPTO_memcmp(const volatile void * volatile in_a,
+                  const volatile void * volatile in_b,
+                  size_t len)
 {
     size_t i;
     const volatile unsigned char *a = in_a;
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 024f2c9..1251aa1 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -542,7 +542,9 @@ int OPENSSL_gmtime_diff(int *pday, int *psec,
  * into a defined order as the return value when a != b is undefined, other
  * than to be non-zero.
  */
-int CRYPTO_memcmp(const volatile void *a, const volatile void *b, size_t len);
+int CRYPTO_memcmp(const volatile void * volatile in_a,
+                  const volatile void * volatile in_b,
+                  size_t len);
 
 /* BEGIN ERROR CODES */
 /*