GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use arc4random_stir over deprecated arc4random_addrandom (#1631)

Browse Source 
Co-authored-by: Azat Khuzhin <azat@libevent.org>
This commit is contained in:
Cœur 2024-10-26 20:46:41 +02:00 committed by GitHub
parent e30b215f34
commit b456e4bd82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -540,8 +540,8 @@ else()
list(APPEND SYMBOLS_TO_CHECK list(APPEND SYMBOLS_TO_CHECK
accept4 accept4
arc4random arc4random
arc4random_addrandom
arc4random_buf arc4random_buf
arc4random_stir
epoll_create epoll_create
epoll_create1 epoll_create1
epoll_ctl epoll_ctl

2
configure.ac
View File

@ -249,7 +249,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE AC_C_INLINE
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS([accept4 arc4random arc4random_addrandom arc4random_buf epoll_create1 epoll_pwait2 eventfd fcntl getegid geteuid getifaddrs getrandom gettimeofday issetugid mach_absolute_time mmap mmap64 nanosleep pipe pipe2 pread putenv sendfile setenv setrlimit sigaction signal socketpair strlcpy strsep strsignal strtok_r strtoll sysctl timerfd_create umask unsetenv usleep]) AC_CHECK_FUNCS([accept4 arc4random arc4random_buf arc4random_stir epoll_create1 epoll_pwait2 eventfd fcntl getegid geteuid getifaddrs getrandom gettimeofday issetugid mach_absolute_time mmap mmap64 nanosleep pipe pipe2 pread putenv sendfile setenv setrlimit sigaction signal socketpair strlcpy strsep strsignal strtok_r strtoll sysctl timerfd_create umask unsetenv usleep])
AS_IF([test "$bwin32" = "true"], AS_IF([test "$bwin32" = "true"],
AC_CHECK_FUNCS(_gmtime64_s, , [AC_CHECK_FUNCS(_gmtime64)]) AC_CHECK_FUNCS(_gmtime64_s, , [AC_CHECK_FUNCS(_gmtime64)])

4
event-config.h.cmake
View File

@ -53,8 +53,8 @@
/* Define to 1 if you have the `arc4random_buf' function. */ /* Define to 1 if you have the `arc4random_buf' function. */
#cmakedefine EVENT__HAVE_ARC4RANDOM_BUF 1 #cmakedefine EVENT__HAVE_ARC4RANDOM_BUF 1
/* Define to 1 if you have the `arc4random_addrandom' function. */ /* Define to 1 if you have the `arc4random_stir' function. */
#cmakedefine EVENT__HAVE_ARC4RANDOM_ADDRANDOM 1 #cmakedefine EVENT__HAVE_ARC4RANDOM_STIR 1
/* Define to 1 if you have the <arpa/inet.h> header file. */ /* Define to 1 if you have the <arpa/inet.h> header file. */
#cmakedefine EVENT__HAVE_ARPA_INET_H 1 #cmakedefine EVENT__HAVE_ARPA_INET_H 1

4
evutil_rand.c
View File

@ -193,9 +193,11 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
void void
evutil_secure_rng_add_bytes(const char *buf, size_t n) evutil_secure_rng_add_bytes(const char *buf, size_t n)
{ {
#if !defined(EVENT__HAVE_ARC4RANDOM) || defined(EVENT__HAVE_ARC4RANDOM_ADDRANDOM) #if !defined(EVENT__HAVE_ARC4RANDOM)
arc4random_addrandom((unsigned char*)buf, arc4random_addrandom((unsigned char*)buf,
n>(size_t)INT_MAX ? INT_MAX : (int)n); n>(size_t)INT_MAX ? INT_MAX : (int)n);
#elif defined(EVENT__HAVE_ARC4RANDOM_STIR)
arc4random_stir();
#endif #endif
} }