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

Clear Valgrind warnings on ARM 

I don't believe these should have been findings. They were clear on x86, Aarch64 and PowerPC.
pull/853/head
Jeffrey Walton 2019-05-25 03:41:05 -04:00
parent 1400757fea
commit 92df2a685f
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drbg.h
View File

@ -207,6 +207,9 @@ public:
size_t nonceLength=0, const byte* personalization=NULLPTR, size_t personalizationLength=0) size_t nonceLength=0, const byte* personalization=NULLPTR, size_t personalizationLength=0)
: NIST_DRBG(), m_c(SEEDLENGTH), m_v(SEEDLENGTH), m_reseed(0) : NIST_DRBG(), m_c(SEEDLENGTH), m_v(SEEDLENGTH), m_reseed(0)
{ {
std::memset(m_c, 0x00, m_c.size());
std::memset(m_v, 0x00, m_v.size());
if (entropy != NULLPTR && entropyLength != 0) if (entropy != NULLPTR && entropyLength != 0)
DRBG_Instantiate(entropy, entropyLength, nonce, nonceLength, personalization, personalizationLength); DRBG_Instantiate(entropy, entropyLength, nonce, nonceLength, personalization, personalizationLength);
} }
@ -324,6 +327,9 @@ public:
size_t nonceLength=0, const byte* personalization=NULLPTR, size_t personalizationLength=0) size_t nonceLength=0, const byte* personalization=NULLPTR, size_t personalizationLength=0)
: NIST_DRBG(), m_k(HASH::DIGESTSIZE), m_v(HASH::DIGESTSIZE), m_reseed(0) : NIST_DRBG(), m_k(HASH::DIGESTSIZE), m_v(HASH::DIGESTSIZE), m_reseed(0)
{ {
std::memset(m_k, 0x00, m_k.size());
std::memset(m_v, 0x00, m_v.size());
if (entropy != NULLPTR && entropyLength != 0) if (entropy != NULLPTR && entropyLength != 0)
DRBG_Instantiate(entropy, entropyLength, nonce, nonceLength, personalization, personalizationLength); DRBG_Instantiate(entropy, entropyLength, nonce, nonceLength, personalization, personalizationLength);
} }

13
misc.h
View File

@ -1225,9 +1225,16 @@ CRYPTOPP_DLL void CRYPTOPP_API CallNewHandler();
/// \note The function is not constant time because it stops processing when the carry is 0. /// \note The function is not constant time because it stops processing when the carry is 0.
inline void IncrementCounterByOne(byte *inout, unsigned int size) inline void IncrementCounterByOne(byte *inout, unsigned int size)
{ {
CRYPTOPP_ASSERT(inout != NULLPTR); CRYPTOPP_ASSERT(size < INT_MAX); unsigned int carry=1;
for (int i=int(size-1), carry=1; i>=0 && carry; i--) while (carry && size != 0)
carry = !++inout[i]; {
// On wrap inout[n] equals 0
carry = ! ++inout[size-1];
size--;
}
if (carry && size == 0)
inout[0]++;
} }
/// \brief Performs an addition with carry on a block of bytes /// \brief Performs an addition with carry on a block of bytes