kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 18:15:18 -07:00
Code Releases Wiki Activity

Move the randombytes_block_on_dev_random() function up

Browse Source
This commit is contained in:
Frank Denis 2019-03-17 19:40:32 +01:00
parent e1abc1de7e
commit 32e36af97e
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/libsodium/randombytes/internal/randombytes_internal_random.c
View File

@ -247,6 +247,34 @@ randombytes_linux_getrandom(void * const buf_, size_t size)
# endif # endif
# ifndef NONEXISTENT_DEV_RANDOM # ifndef NONEXISTENT_DEV_RANDOM
# ifdef BLOCK_ON_DEV_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_internal_random_random_dev_open(void) randombytes_internal_random_random_dev_open(void)
{ {
@ -311,33 +339,6 @@ safe_read(const int fd, void * const buf_, size_t size)
return (ssize_t) (buf - (unsigned char *) buf_); return (ssize_t) (buf - (unsigned char *) buf_);
} }
# ifdef BLOCK_ON_DEV_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
# endif /* !NONEXISTENT_DEV_RANDOM */ # endif /* !NONEXISTENT_DEV_RANDOM */
static void static void