1 files changed, 7 insertions, 3 deletions
diff --git a/rijndael.h b/rijndael.h
index 7866adc..e34f6c9 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -24,22 +24,26 @@ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentat
 		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
 
 	protected:
+		static void FillEncTable();
+		static void FillDecTable();
+
 		// VS2005 workaround: have to put these on seperate lines, or error C2487 is triggered in DLL build
 		static const byte Se[256];
 		static const byte Sd[256];
-		static const word32 Te[4*256];
-		static const word32 Td[4*256];
 
 		static const word32 rcon[];
 
 		unsigned int m_rounds;
-		SecBlock<word32> m_key;
+		SecBlock<word32, AllocatorWithCleanup<word32, CRYPTOPP_BOOL_X86> > m_key;
 	};
 
 	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Enc : public Base
 	{
 	public:
 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
+#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
+		size_t AdvancedProcessBlocks(const byte *inBlocks, const byte *xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
+#endif
 	};
 
 	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Dec : public Base