summaryrefslogtreecommitdiff
path: root/rijndael.cpp
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2011-01-07 01:38:48 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2011-01-07 01:38:48 +0000
commitb6cee6fa17b487467c84ac2eaf4c904f119bc9c4 (patch)
treec1800b00d08c28e7806972109c49f7d6fc7641f5 /rijndael.cpp
parent80640a5c45dc11ffaca85c59288633423d7acdcb (diff)
downloadcryptopp-b6cee6fa17b487467c84ac2eaf4c904f119bc9c4.tar.gz
fix for https://sourceforge.net/apps/trac/cryptopp/ticket/6
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@523 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'rijndael.cpp')
-rw-r--r--rijndael.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/rijndael.cpp b/rijndael.cpp
index 608b9d3..0081e22 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -349,7 +349,11 @@ void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, c
void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
{
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
if (HasSSE2())
+#else
+ if (HasAESNI())
+#endif
{
Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0);
return;