The branch master has been updated
via d913a0557f040e54120d028ced0a29767f7b12bb (commit)
from e12e903e9ac675d08f9dd0db1f0c1a2049232c21 (commit)
- Log -----------------------------------------------------------------
commit d913a0557f040e54120d028ced0a29767f7b12bb
Author: Kurt Roeckx <k...@roeckx.be>
Date: Mon Feb 20 18:27:22 2017 +0100
Revert "Use memcmp() instead of CRYPTO_memcmp() when fuzzing"
This reverts commit 3aad8e18707bccaabee5f111de2db0696b45781c.
Reviewed-by: Andy Polyakov <ap...@openssl.org>
GH: #2686
-----------------------------------------------------------------------
Summary of changes:
crypto/cryptlib.c | 1 -
e_os.h | 4 ----
2 files changed, 5 deletions(-)
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index f916193..01b8ce5 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 d2f4d3f..eafa862 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
