arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix BlockingRng for OpenBSD

pull/2/head
weidai 2006-12-13 04:08:09 +00:00
parent 5184d7c8f3
commit 5766de54ef
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osrng.cpp
View File

@ -101,11 +101,19 @@ void NonblockingRng::GenerateBlock(byte *output, size_t size)
#ifdef BLOCKING_RNG_AVAILABLE #ifdef BLOCKING_RNG_AVAILABLE
#ifndef CRYPTOPP_BLOCKING_RNG_FILENAME
#ifdef __OpenBSD__
#define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/srandom"
#else
#define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/random"
#endif
#endif
BlockingRng::BlockingRng() BlockingRng::BlockingRng()
{ {
m_fd = open("/dev/random",O_RDONLY); m_fd = open(CRYPTOPP_BLOCKING_RNG_FILENAME,O_RDONLY);
if (m_fd == -1) if (m_fd == -1)
throw OS_RNG_Err("open /dev/random"); throw OS_RNG_Err("open " CRYPTOPP_BLOCKING_RNG_FILENAME);
} }
BlockingRng::~BlockingRng() BlockingRng::~BlockingRng()
@ -128,7 +136,7 @@ void BlockingRng::GenerateBlock(byte *output, size_t size)
// are available, on others it will returns immediately // are available, on others it will returns immediately
ssize_t len = read(m_fd, output, size); ssize_t len = read(m_fd, output, size);
if (len < 0) if (len < 0)
throw OS_RNG_Err("read /dev/random"); throw OS_RNG_Err("read " CRYPTOPP_BLOCKING_RNG_FILENAME);
size -= len; size -= len;
output += len; output += len;
if (size) if (size)