diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-29 12:09:05 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-30 14:41:23 -0500 |
| commit | e0fde613acb2dcd5be0750f002e80bf345401a2e (patch) | |
| tree | b4efb47f67396b30614513d24560d0289064ff95 | |
| parent | 2454accb6eac2c1aca37fff588d9c65503c7f3ec (diff) | |
GH102: Add volatile to CRYPTO_memcmp
Can't hurt and seems to prevent problems from some over-aggressive
(LTO?) compilers.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 98ab57644f44d2d83595c2d0f69138a284d6096b)
| -rw-r--r-- | crypto/cryptlib.c | 6 | ||||
| -rw-r--r-- | crypto/crypto.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index c9f674ba8e..1925428f5e 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -1016,11 +1016,11 @@ void *OPENSSL_stderr(void) return stderr; } -int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len) +int CRYPTO_memcmp(const volatile void *in_a, const volatile void *in_b, size_t len) { size_t i; - const unsigned char *a = in_a; - const unsigned char *b = in_b; + const volatile unsigned char *a = in_a; + const volatile unsigned char *b = in_b; unsigned char x = 0; for (i = 0; i < len; i++) diff --git a/crypto/crypto.h b/crypto/crypto.h index c450d7a3c3..6c644ce12a 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -628,7 +628,7 @@ void OPENSSL_init(void); * into a defined order as the return value when a != b is undefined, other * than to be non-zero. */ -int CRYPTO_memcmp(const void *a, const void *b, size_t len); +int CRYPTO_memcmp(const volatile void *a, const volatile void *b, size_t len); /* BEGIN ERROR CODES */ /* |