generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GH102: Add volatile to CRYPTO_memcmp

Browse Source 
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 98ab57644f)
This commit is contained in:
Rich Salz
2016-01-29 12:09:05 -05:00
committed by Rich Salz
parent 2454accb6e
commit e0fde613ac
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/cryptlib.c
View File

@@ -1016,11 +1016,11 @@ void *OPENSSL_stderr(void)
return stderr; 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; size_t i;
const unsigned char *a = in_a; const volatile unsigned char *a = in_a;
const unsigned char *b = in_b; const volatile unsigned char *b = in_b;
unsigned char x = 0; unsigned char x = 0;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)

2
crypto/crypto.h
View File

@@ -628,7 +628,7 @@ void OPENSSL_init(void);
* into a defined order as the return value when a != b is undefined, other * into a defined order as the return value when a != b is undefined, other
* than to be non-zero. * 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 */ /* BEGIN ERROR CODES */
/* /*