kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-20 10:37:24 -07:00
Code Releases Wiki Activity

On ancient Linux kernels, block on /dev/random before using /dev/urandom

Browse Source
This commit is contained in:
Frank Denis 2016-05-15 17:18:50 +02:00
parent 1e1ba1af02
commit c752eb55d9
2 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
View File

@ -7,6 +7,7 @@
#endif #endif
#ifdef __linux__ #ifdef __linux__
# include <sys/syscall.h> # include <sys/syscall.h>
# include <poll.h>
#endif #endif
#include <assert.h> #include <assert.h>
@ -128,6 +129,33 @@ safe_read(const int fd, void * const buf_, size_t size)
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
# if defined(__linux__) && !defined(USE_BLOCKING_RANDOM)
static int
randombytes_block_on_dev_random(void)
{
struct pollfd pfd;
int fd;
int pret;
fd = open("/dev/random", O_RDONLY);
if (fd == -1) {
return 0;
}
pfd.fd = fd;
pfd.events = POLLIN;
pfd.revents = 0;
do {
pret = poll(&pfd, 1, -1);
} while (pret < 0 && (errno == EINTR || errno == EAGAIN));
if (pret != 1) {
(void) close(fd);
errno = EIO;
return -1;
}
return close(fd);
}
# endif
# ifndef HAVE_SAFE_ARC4RANDOM # ifndef HAVE_SAFE_ARC4RANDOM
static int static int
randombytes_salsa20_random_random_dev_open(void) randombytes_salsa20_random_random_dev_open(void)
@ -143,6 +171,11 @@ randombytes_salsa20_random_random_dev_open(void)
const char ** device = devices; const char ** device = devices;
int fd; int fd;
# if defined(__linux__) && !defined(USE_BLOCKING_RANDOM)
if (randombytes_block_on_dev_random() != 0) {
return -1;
}
# endif
do { do {
fd = open(*device, O_RDONLY); fd = open(*device, O_RDONLY);
if (fd != -1) { if (fd != -1) {

33
src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c
View File

@ -7,6 +7,7 @@
#endif #endif
#ifdef __linux__ #ifdef __linux__
# include <sys/syscall.h> # include <sys/syscall.h>
# include <poll.h>
#endif #endif
#include <assert.h> #include <assert.h>
@ -107,6 +108,33 @@ safe_read(const int fd, void * const buf_, size_t size)
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
# if defined(__linux__) && !defined(USE_BLOCKING_RANDOM)
static int
randombytes_block_on_dev_random(void)
{
struct pollfd pfd;
int fd;
int pret;
fd = open("/dev/random", O_RDONLY);
if (fd == -1) {
return 0;
}
pfd.fd = fd;
pfd.events = POLLIN;
pfd.revents = 0;
do {
pret = poll(&pfd, 1, -1);
} while (pret < 0 && (errno == EINTR || errno == EAGAIN));
if (pret != 1) {
(void) close(fd);
errno = EIO;
return -1;
}
return close(fd);
}
# endif
static int static int
randombytes_sysrandom_random_dev_open(void) randombytes_sysrandom_random_dev_open(void)
{ {
@ -121,6 +149,11 @@ randombytes_sysrandom_random_dev_open(void)
const char ** device = devices; const char ** device = devices;
int fd; int fd;
# if defined(__linux__) && !defined(USE_BLOCKING_RANDOM)
if (randombytes_block_on_dev_random() != 0) {
return -1;
}
# endif
do { do {
fd = open(*device, O_RDONLY); fd = open(*device, O_RDONLY);
if (fd != -1) { if (fd != -1) {