mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
random.c: use getrandom() if available.
getrandom() is supported by glibc 2.25 or later. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b1cb15c4a4
commit
1a8583de72
2 changed files with 27 additions and 0 deletions
|
@ -1826,6 +1826,7 @@ AC_CHECK_FUNCS(getpgid)
|
|||
AC_CHECK_FUNCS(getpgrp)
|
||||
AC_CHECK_FUNCS(getpriority)
|
||||
AC_CHECK_FUNCS(getpwnam_r)
|
||||
AC_CHECK_FUNCS(getrandom)
|
||||
AC_CHECK_FUNCS(getresgid)
|
||||
AC_CHECK_FUNCS(getresuid)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
|
|
26
random.c
26
random.c
|
@ -390,6 +390,32 @@ fill_random_bytes_syscall(void *seed, size_t size, int unused)
|
|||
CryptGenRandom(prov, size, seed);
|
||||
return 0;
|
||||
}
|
||||
#elif defined HAVE_GETRANDOM
|
||||
#include <sys/random.h>
|
||||
|
||||
static int
|
||||
fill_random_bytes_syscall(void *seed, size_t size, int need_secure)
|
||||
{
|
||||
static rb_atomic_t try_syscall = 1;
|
||||
if (try_syscall) {
|
||||
ssize_t ret;
|
||||
size_t offset = 0;
|
||||
int flags = 0;
|
||||
if (!need_secure)
|
||||
flags = GRND_NONBLOCK;
|
||||
do {
|
||||
errno = 0;
|
||||
ret = getrandom(((char*)seed) + offset, size - offset, flags);
|
||||
if (ret == -1) {
|
||||
ATOMIC_SET(try_syscall, 0);
|
||||
return -1;
|
||||
}
|
||||
offset += (size_t)ret;
|
||||
} while(offset < size);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
#elif defined __linux__ && defined __NR_getrandom
|
||||
#include <linux/random.h>
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue