Commit 769adcfe authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

GH102: Extra volatile avoids GCC bug 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent 9716b0b9

crypto/cryptlib.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

include/openssl/crypto.h

+3 −1
Original line number Diff line number Diff line
@@ -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 */

/*