[patch] Patch from upstream to fix infinite recursion in deciding whether to use portable code, SSE2 assembly, or AESNI in Rijndael.cpp

crypto++-5.6.1-rijndael.patch (text/plain), 578 bytes, created by .:deadhead:. on 2011-12-27 15:37:22 UTC

--- rijndael.cpp	2010-08-06 18:46:22.000000000 +0200
+++ rijndael.cpp2	2011-12-27 16:10:52.606933355 +0100
@@ -349,7 +349,11 @@
 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;