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

Fixed memory error after switch to FixedSizeAlignedSecBlock<State> and FixedSizeAlignedSecBlock<ParameterBlock>

pull/174/head
Jeffrey Walton 2016-05-19 14:39:25 -04:00
parent 1c8c16f9e8
commit d37b3f9028
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blake2.h
View File

@ -104,7 +104,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_ParameterBlock<false>
BLAKE2_ParameterBlock(size_t digestSize) BLAKE2_ParameterBlock(size_t digestSize)
{ {
assert(digestSize <= BLAKE2_Info<false>::DIGESTSIZE); assert(digestSize <= DIGESTSIZE);
memset(this, 0x00, sizeof(*this)); memset(this, 0x00, sizeof(*this));
digestLength = (byte)digestSize; digestLength = (byte)digestSize;
fanout = depth = 1; fanout = depth = 1;
@ -221,8 +221,8 @@ protected:
void UncheckedSetKey(const byte* key, unsigned int length, const CryptoPP::NameValuePairs& params); void UncheckedSetKey(const byte* key, unsigned int length, const CryptoPP::NameValuePairs& params);
private: private:
FixedSizeAlignedSecBlock<State,1> m_state; FixedSizeAlignedSecBlock<State,sizeof(State)> m_state;
FixedSizeAlignedSecBlock<ParameterBlock,1> m_block; FixedSizeAlignedSecBlock<ParameterBlock,sizeof(ParameterBlock)> m_block;
AlignedSecByteBlock m_key; AlignedSecByteBlock m_key;
word32 m_digestSize; word32 m_digestSize;
bool m_treeMode; bool m_treeMode;