diff --git a/ipc/chromium/src/third_party/libevent/evutil_rand.c b/ipc/chromium/src/third_party/libevent/evutil_rand.c index 3bab23121..c1e8a98ef 100644 --- a/ipc/chromium/src/third_party/libevent/evutil_rand.c +++ b/ipc/chromium/src/third_party/libevent/evutil_rand.c @@ -39,7 +39,7 @@ #include "util-internal.h" #include "evthread-internal.h" -#ifdef _EVENT_HAVE_ARC4RANDOM +#if _EVENT_HAVE_ARC4RANDOM #include #include int @@ -58,7 +58,7 @@ evutil_secure_rng_global_setup_locks_(const int enable_locks) static void ev_arc4random_buf(void *buf, size_t n) { -#if defined(_EVENT_HAVE_ARC4RANDOM_BUF) && !(defined(__APPLE__) || defined(__ANDROID__)) +#if _EVENT_HAVE_ARC4RANDOM_BUF && !(defined(__APPLE__) || defined(__ANDROID__)) arc4random_buf(buf, n); #else unsigned char *b = buf; @@ -139,7 +139,7 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) ev_arc4random_buf(buf, n); } -#if !defined(__OpenBSD__) && !defined(ANDROID) +#if 0 void evutil_secure_rng_add_bytes(const char *buf, size_t n) { diff --git a/ipc/chromium/src/third_party/libevent/include/event2/util.h b/ipc/chromium/src/third_party/libevent/include/event2/util.h index 42a28adcb..ed6b6207f 100644 --- a/ipc/chromium/src/third_party/libevent/include/event2/util.h +++ b/ipc/chromium/src/third_party/libevent/include/event2/util.h @@ -672,7 +672,7 @@ void evutil_secure_rng_get_bytes(void *buf, size_t n); */ int evutil_secure_rng_init(void); -#if !defined(__OpenBSD__) && !defined(ANDROID) +#if 0 /** Seed the random number generator with extra random bytes. You should almost never need to call this function; it should be diff --git a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h index 56ebd3aba..21717abed 100644 --- a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +++ b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h @@ -24,10 +24,10 @@ /* #undef _EVENT_DISABLE_THREAD_SUPPORT */ /* Define to 1 if you have the `arc4random' function. */ -/* #undef _EVENT_HAVE_ARC4RANDOM */ +#define _EVENT_HAVE_ARC4RANDOM (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 36) /* Define to 1 if you have the `arc4random_buf' function. */ -/* #undef _EVENT_HAVE_ARC4RANDOM_BUF */ +#define _EVENT_HAVE_ARC4RANDOM_BUF _EVENT_HAVE_ARC4RANDOM /* Define to 1 if you have the header file. */ #define _EVENT_HAVE_ARPA_INET_H 1