aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib9/truerand.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib9/truerand.c b/src/lib9/truerand.c
index 04462e27..b3c343ef 100644
--- a/src/lib9/truerand.c
+++ b/src/lib9/truerand.c
@@ -7,17 +7,19 @@ truerand(void)
int i, n;
uchar buf[sizeof(ulong)];
static int randfd = -1;
+ static char *randfile;
if(randfd < 0){
- randfd = open("/dev/random", OREAD);
- if(randfd < 0)
- randfd = open("/dev/srandom", OREAD); /* OpenBSD */
+ randfd = open(randfile="/dev/random", OREAD);
+ /* OpenBSD lets you open /dev/random but not read it! */
+ if(randfd < 0 || read(randfd, buf, 1) != 1)
+ randfd = open(randfile="/dev/srandom", OREAD); /* OpenBSD */
if(randfd < 0)
sysfatal("can't open /dev/random: %r");
fcntl(randfd, F_SETFD, FD_CLOEXEC);
}
for(i=0; i<sizeof(buf); i += n)
if((n = readn(randfd, buf+i, sizeof(buf)-i)) < 0)
- sysfatal("can't read /dev/random: %r");
+ sysfatal("can't read %s: %r", randfile);
return *((ulong*)buf);
}