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

Cleared Valgrind warnings on uninitialized reads (Issue 105)

pull/109/head
Jeffrey Walton 2016-01-10 14:25:47 -05:00
parent dce2317195
commit 76b2f9387d
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
rng.cpp
View File

@ -59,25 +59,33 @@ void LC_RNG::GenerateBlock(byte *output, size_t size)
#ifndef CRYPTOPP_IMPORTS #ifndef CRYPTOPP_IMPORTS
X917RNG::X917RNG(BlockTransformation *c, const byte *seed, const byte *deterministicTimeVector) X917RNG::X917RNG(BlockTransformation *c, const byte *seed, const byte *deterministicTimeVector)
: cipher(c), : m_cipher(c),
S(cipher->BlockSize()), m_size(m_cipher->BlockSize()),
dtbuf(S), m_datetime(m_size),
randseed(seed, S), m_randseed(seed, m_size),
m_lastBlock(S), m_lastBlock(m_size),
m_deterministicTimeVector(deterministicTimeVector, deterministicTimeVector ? S : 0) m_deterministicTimeVector(deterministicTimeVector, deterministicTimeVector ? m_size : 0)
{ {
// Valgrind finding, http://github.com/weidai11/cryptopp/issues/105
// Garbage in the tail creates a non-conforming X9.17 or X9.31 generator.
if (m_size > 8)
{
memset(m_datetime, 0x00, m_size);
memset(m_lastBlock, 0x00, m_size);
}
if (!deterministicTimeVector) if (!deterministicTimeVector)
{ {
time_t tstamp1 = time(0); time_t tstamp1 = time(0);
xorbuf(dtbuf, (byte *)&tstamp1, UnsignedMin(sizeof(tstamp1), S)); xorbuf(m_datetime, (byte *)&tstamp1, UnsignedMin(sizeof(tstamp1), m_size));
cipher->ProcessBlock(dtbuf); m_cipher->ProcessBlock(m_datetime);
clock_t tstamp2 = clock(); clock_t tstamp2 = clock();
xorbuf(dtbuf, (byte *)&tstamp2, UnsignedMin(sizeof(tstamp2), S)); xorbuf(m_datetime, (byte *)&tstamp2, UnsignedMin(sizeof(tstamp2), m_size));
cipher->ProcessBlock(dtbuf); m_cipher->ProcessBlock(m_datetime);
} }
// for FIPS 140-2 // for FIPS 140-2
GenerateBlock(m_lastBlock, S); GenerateBlock(m_lastBlock, m_size);
} }
void X917RNG::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size) void X917RNG::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size)
@ -87,35 +95,35 @@ void X917RNG::GenerateIntoBufferedTransformation(BufferedTransformation &target,
// calculate new enciphered timestamp // calculate new enciphered timestamp
if (m_deterministicTimeVector.size()) if (m_deterministicTimeVector.size())
{ {
cipher->ProcessBlock(m_deterministicTimeVector, dtbuf); m_cipher->ProcessBlock(m_deterministicTimeVector, m_datetime);
IncrementCounterByOne(m_deterministicTimeVector, S); IncrementCounterByOne(m_deterministicTimeVector, m_size);
} }
else else
{ {
clock_t c = clock(); clock_t c = clock();
xorbuf(dtbuf, (byte *)&c, UnsignedMin(sizeof(c), S)); xorbuf(m_datetime, (byte *)&c, UnsignedMin(sizeof(c), m_size));
time_t t = time(NULL); time_t t = time(NULL);
xorbuf(dtbuf+S-UnsignedMin(sizeof(t), S), (byte *)&t, UnsignedMin(sizeof(t), S)); xorbuf(m_datetime+m_size-UnsignedMin(sizeof(t), m_size), (byte *)&t, UnsignedMin(sizeof(t), m_size));
cipher->ProcessBlock(dtbuf); m_cipher->ProcessBlock(m_datetime);
} }
// combine enciphered timestamp with seed // combine enciphered timestamp with seed
xorbuf(randseed, dtbuf, S); xorbuf(m_randseed, m_datetime, m_size);
// generate a new block of random bytes // generate a new block of random bytes
cipher->ProcessBlock(randseed); m_cipher->ProcessBlock(m_randseed);
if (memcmp(m_lastBlock, randseed, S) == 0) if (memcmp(m_lastBlock, m_randseed, m_size) == 0)
throw SelfTestFailure("X917RNG: Continuous random number generator test failed."); throw SelfTestFailure("X917RNG: Continuous random number generator test failed.");
// output random bytes // output random bytes
size_t len = UnsignedMin(S, size); size_t len = UnsignedMin(m_size, size);
target.ChannelPut(channel, randseed, len); target.ChannelPut(channel, m_randseed, len);
size -= len; size -= len;
// compute new seed vector // compute new seed vector
memcpy(m_lastBlock, randseed, S); memcpy(m_lastBlock, m_randseed, m_size);
xorbuf(randseed, dtbuf, S); xorbuf(m_randseed, m_datetime, m_size);
cipher->ProcessBlock(randseed); m_cipher->ProcessBlock(m_randseed);
} }
} }

8
rng.h
View File

@ -69,10 +69,10 @@ public:
void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size); void GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword size);
private: private:
member_ptr<BlockTransformation> cipher; member_ptr<BlockTransformation> m_cipher;
const unsigned int S; // blocksize of cipher const unsigned int m_size; // S, blocksize of cipher
SecByteBlock dtbuf; // buffer for enciphered timestamp SecByteBlock m_datetime; // DT, buffer for enciphered timestamp
SecByteBlock randseed, m_lastBlock, m_deterministicTimeVector; SecByteBlock m_randseed, m_lastBlock, m_deterministicTimeVector;
}; };
//! \class MaurerRandomnessTest //! \class MaurerRandomnessTest