create DLL version, fix GetNextIV() bug in CTR and OFB modes

1 files changed, 7 insertions, 7 deletions

diff --git a/rijndael.h b/rijndael.h
index a1540481..efa788a3 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -11,13 +11,13 @@ NAMESPACE_BEGIN(CryptoPP)
 
 struct Rijndael_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32, 8>
 {
-	static const char *StaticAlgorithmName() {return "Rijndael";}
+	CRYPTOPP_DLL static const char * StaticAlgorithmName() {return "Rijndael";}
 };
 
 /// <a href="http://www.weidai.com/scan-mirror/cs.html#Rijndael">Rijndael</a>
-class Rijndael : public Rijndael_Info, public BlockCipherDocumentation
+class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentation
 {
-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherBaseTemplate<Rijndael_Info>
+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>
 	{
 	public:
 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);
@@ -41,21 +41,21 @@ class Rijndael : public Rijndael_Info, public BlockCipherDocumentation
 		SecBlock<word32> m_key;
 	};
 
-	class CRYPTOPP_NO_VTABLE Enc : public Base
+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Enc : public Base
 	{
 	public:
 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
 	};
 
-	class CRYPTOPP_NO_VTABLE Dec : public Base
+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Dec : public Base
 	{
 	public:
 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
 	};
 
 public:
-	typedef BlockCipherTemplate<ENCRYPTION, Enc> Encryption;
-	typedef BlockCipherTemplate<DECRYPTION, Dec> Decryption;
+	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
+	typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;
 };
 
 typedef Rijndael::Encryption RijndaelEncryption;