ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add random_bytes() function, used when arc4random() is not available

This commit is contained in:
Alexandre Ratchov 2011-05-23 13:40:50 +02:00
parent 02f3853786
commit 2f94e45ccd
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libsndio/aucat.c
View File

@ -38,9 +38,40 @@
#include "bsd-compat.h"
#ifndef USE_ARC4RANDOM
#ifndef DEV_RANDOM
#define DEV_RANDOM "/dev/arandom"
#endif
static int
random_bytes(unsigned char *buf, int len)
{
ssize_t n;
int fd;
fd = open(DEV_RANDOM, O_RDONLY);
if (fd < 0) {
DPERROR(DEV_RANDOM);
return 0;
}
while (len > 0) {
n = read(fd, buf, len);
if (n < 0) {
DPERROR(DEV_RANDOM);
close(fd);
return 0;
}
if (n == 0) {
DPRINTF("%s: unexpected eof\n", DEV_RANDOM);
close(fd);
return 0;
}
buf += n;
len -= n;
}
close(fd);
return 1;
}
#endif
/*
@ -210,9 +241,6 @@ aucat_mkcookie(unsigned char *cookie)
struct stat sb;
char buf[PATH_MAX], tmp[PATH_MAX], *path;
ssize_t len;
#ifndef USE_ARC4RANDOM
ssize_t n;
#endif
int fd;
/*
@ -260,27 +288,8 @@ bad_gen:
#ifdef USE_ARC4RANDOM
arc4random_buf(cookie, AMSG_COOKIELEN);
#else
fd = open(DEV_RANDOM, O_RDONLY);
if (fd < 0) {
DPERROR(DEV_RANDOM);
if (!random_bytes(cookie, AMSG_COOKIELEN))
return 0;
}
len = AMSG_COOKIELEN;
while (len > 0) {
n = read(fd, cookie, len);
if (n < 0) {
DPERROR(DEV_RANDOM);
close(fd);
return 0;
}
if (n == 0) {
close(fd);
return 0;
}
cookie += n;
len -= n;
}
close(fd);
#endif
/*