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

Revert "Clear conversion warning" 

This reverts commit 9748c3cf3e. It broke Windows.
pull/687/head
Jeffrey Walton 2018-07-10 17:18:11 -04:00
parent a2ca2cfc0f
commit 961e9b483c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
iterhash.h
View File

@ -156,10 +156,7 @@ public:
protected: protected:
T_HashWordType* DataBuf() {return this->m_data;} T_HashWordType* DataBuf() {return this->m_data;}
FixedSizeSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType)> m_data;
// Squash conversion warning
CRYPTOPP_CONSTANT(DCOUNT=T_BlockSize/sizeof(T_HashWordType))
FixedSizeSecBlock<T_HashWordType, DCOUNT> m_data;
}; };
/// \brief Iterated hash with a static transformation function /// \brief Iterated hash with a static transformation function
@ -189,11 +186,9 @@ protected:
IteratedHashWithStaticTransform() {this->Init();} IteratedHashWithStaticTransform() {this->Init();}
void HashEndianCorrectedBlock(const T_HashWordType *data) {T_Transform::Transform(this->m_state, data);} void HashEndianCorrectedBlock(const T_HashWordType *data) {T_Transform::Transform(this->m_state, data);}
void Init() {T_Transform::InitState(this->m_state);} void Init() {T_Transform::InitState(this->m_state);}
T_HashWordType* StateBuf() {return this->m_state;}
// Squash conversion warning T_HashWordType* StateBuf() {return this->m_state;}
CRYPTOPP_CONSTANT(SCOUNT=T_BlockSize/sizeof(T_HashWordType)) FixedSizeAlignedSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType), T_StateAligned> m_state;
FixedSizeSecBlock<T_HashWordType, SCOUNT> m_state;
}; };
#if !defined(__GNUC__) && !defined(__clang__) #if !defined(__GNUC__) && !defined(__clang__)