colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify urandom usage, & keep device open between uses

This commit is contained in:
Brian Cox 2017-07-17 22:35:17 -07:00
parent 60fede7678
commit 5757a53d61
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/twcrypto/crypto.cpp
View File

@ -1244,16 +1244,18 @@ cHashedKey192::~cHashedKey192()
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
#if HAVE_DEVICE_RANDOM #if HAVE_DEVICE_RANDOM
static bool randomize_by_device(const char* device_name, int8* destbuf, int len) static bool randomize_by_device(const char* device_name, int8* destbuf, int len)
{ {
int rng_device = open(device_name, O_RDONLY|O_NONBLOCK); static int rng_device = -1;
if (-1 == rng_device)
rng_device = open(device_name, O_RDONLY|O_NONBLOCK);
if (rng_device >= 0) if (rng_device >= 0)
{ {
int bytes_read = read(rng_device, destbuf, len); int bytes_read = read(rng_device, destbuf, len);
close(rng_device);
if (bytes_read == len) if (bytes_read == len)
return true; return true;
} }
return false; return false;
@ -1267,27 +1269,11 @@ static bool gRandomizeBytesSeeded = false;
void RandomizeBytes(int8* destbuf, int len) void RandomizeBytes(int8* destbuf, int len)
{ {
#if HAVE_DEVICE_RANDOM
#if HAVE_DEV_URANDOM #if HAVE_DEV_URANDOM
if (randomize_by_device("/dev/urandom", destbuf, len)) if (randomize_by_device("/dev/urandom", destbuf, len))
return; return;
#endif
#if HAVE_DEV_ARANDOM
if (randomize_by_device("/dev/arandom", destbuf, len))
return;
#endif
#if HAVE_DEV_RANDOM
if (randomize_by_device("/dev/random", destbuf, len))
return;
#endif
ThrowAndAssert(eInternal(_T("Failed to read from any RNG devices")));
// TODO: OpenSSL or other impls that are better than the default one
ThrowAndAssert(eInternal(_T("Failed to read from RNG device")));
#else #else
if (!gRandomizeBytesSeeded) if (!gRandomizeBytesSeeded)
{ {