diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-15 17:01:15 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-19 22:33:00 +0200 |
| commit | e33826f01bd78af76e0135c8dfab3387927a82bb (patch) | |
| tree | a44459e3859610fe7ce35bc4923d8af6d6110e09 /crypto/cryptlib.c | |
| parent | 2e6d7799ffc47604d06e0465afeb84b91aff8006 (diff) | |
| download | openssl-new-e33826f01bd78af76e0135c8dfab3387927a82bb.tar.gz | |
Add assembly CRYPTO_memcmp.
GH: #102
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 92e323c609..8e189eca64 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -316,6 +316,7 @@ void OPENSSL_die(const char *message, const char *file, int line) #endif } +#if !defined(OPENSSL_CPUID_OBJ) /* volatile unsigned char* pointers are there because * 1. Accessing a variable declared volatile via a pointer * that lacks a volatile qualifier causes undefined behavior. @@ -347,3 +348,4 @@ int CRYPTO_memcmp(const volatile void * volatile in_a, return x; } +#endif |