mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-02 20:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #657 from stoeckmann/getrandom

Browse Source 
Use GRND_NONBLOCK with getrandom.
This commit is contained in:
Eric Hawicz
2020-08-15 15:01:41 -04:00
committed by GitHub
parent 104b408ee8 f052e42f56
commit cf30cba4ac
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
random_seed.c
View File

@@ -164,19 +164,21 @@ retry:
static int get_getrandom_seed(void) static int get_getrandom_seed(void)
{ {
DEBUG_SEED("get_dev_random_seed"); DEBUG_SEED("get_getrandom_seed");
int r; int r;
ssize_t ret; ssize_t ret;
do { do {
ret = getrandom(&r, sizeof(r), 0); ret = getrandom(&r, sizeof(r), GRND_NONBLOCK);
} while ((ret == -1) && (errno == EINTR)); } while ((ret == -1) && (errno == EINTR));
if (ret == -1) if (ret == -1)
{ {
if (errno == ENOSYS) /* syscall not available in kernel */ if (errno == ENOSYS) /* syscall not available in kernel */
return -1; return -1;
if (errno == EAGAIN) /* entropy not yet initialized */
return -1;
fprintf(stderr, "error from getrandom(): %s", strerror(errno)); fprintf(stderr, "error from getrandom(): %s", strerror(errno));
exit(1); exit(1);