diff options
| author | rsc <devnull@localhost> | 2005-09-19 16:40:56 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2005-09-19 16:40:56 +0000 |
| commit | 3a6c348fba8ca00ff22315a0e270eca5bc55e84d (patch) | |
| tree | 4d7a133c30e9fd8b1cc160088e49fc016c744d00 | |
| parent | 8e06ea1b42726a61e3fcff3ccb6cefe29cbfc387 (diff) | |
| download | plan9port-3a6c348fba8ca00ff22315a0e270eca5bc55e84d.tar.gz plan9port-3a6c348fba8ca00ff22315a0e270eca5bc55e84d.tar.bz2 plan9port-3a6c348fba8ca00ff22315a0e270eca5bc55e84d.zip | |
OpenBSD lets you open /dev/random but not read it!
| -rw-r--r-- | src/lib9/truerand.c | 10 |
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); } |