From: Kurt Roeckx <kurt@roeckx.be>
Date: Mon, 20 Feb 2017 17:27:22 +0000 (+0100)
Subject: Revert "Use memcmp() instead of CRYPTO_memcmp() when fuzzing"
X-Git-Tag: OpenSSL_1_1_1-pre1~2336
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d913a0557f040e54120d028ced0a29767f7b12bb;p=oweals%2Fopenssl.git

Revert "Use memcmp() instead of CRYPTO_memcmp() when fuzzing"

This reverts commit 3aad8e18707bccaabee5f111de2db0696b45781c.

Reviewed-by: Andy Polyakov <appro@openssl.org>
GH: #2686
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index f916193605..01b8ce5ed1 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -324,7 +324,6 @@ void OPENSSL_die(const char *message, const char *file, int line)
  * pointers to volatile to not be emitted in some rare,
  * never needed in real life, pieces of code.
  */
-# undef CRYPTO_memcmp
 int CRYPTO_memcmp(const volatile void * volatile in_a,
                   const volatile void * volatile in_b,
                   size_t len)
diff --git a/e_os.h b/e_os.h
index d2f4d3ff28..eafa8623aa 100644
--- a/e_os.h
+++ b/e_os.h
@@ -513,10 +513,6 @@ struct servent *getservbyname(const char *name, const char *proto);
 
 #define OSSL_NELEM(x)    (sizeof(x)/sizeof(x[0]))
 
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-# define CRYPTO_memcmp memcmp
-#endif
-
 #ifdef  __cplusplus
 }
 #endif