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

fix compile on non-x86

pull/2/head
weidai 2009-03-02 05:23:21 +00:00
parent d8a644fc4e
commit 7d88bbd9ed
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
algparam.h
View File

@ -373,7 +373,7 @@ protected:
member_ptr<AlgorithmParametersBase> & Next() const {return const_cast<AlgorithmParameters *>(this)->Next();} member_ptr<AlgorithmParametersBase> & Next() const {return const_cast<AlgorithmParameters *>(this)->Next();}
bool m_constructed, m_defaultThrowIfNotUsed; bool m_constructed, m_defaultThrowIfNotUsed;
char m_first[sizeof(AlgorithmParametersBase) + 16]; size_t m_first[(sizeof(AlgorithmParametersBase) + 19)/sizeof(size_t)];
}; };
//! Create an object that implements NameValuePairs for passing parameters //! Create an object that implements NameValuePairs for passing parameters

6
rijndael.cpp
View File

@ -675,6 +675,8 @@ void Rijndael_Enc_AdvancedProcessBlocks(void *locals, const word32 *k);
} }
#endif #endif
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
static inline bool AliasedWithTable(const byte *begin, const byte *end) static inline bool AliasedWithTable(const byte *begin, const byte *end)
{ {
size_t s0 = size_t(begin)%4096, s1 = size_t(end)%4096; size_t s0 = size_t(begin)%4096, s1 = size_t(end)%4096;
@ -746,9 +748,11 @@ size_t Rijndael::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xo
return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags); return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks, outBlocks, length, flags);
} }
#endif
void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
{ {
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
if (HasSSE2()) if (HasSSE2())
{ {
Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0); Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);