port to GCC 4, reorganize implementations of SetKey

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@248 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 2 insertions, 2 deletions

diff --git a/square.cpp b/square.cpp
index 9d5466f..3686eac 100644
--- a/square.cpp
+++ b/square.cpp
@@ -31,7 +31,7 @@ static void SquareTransform (word32 in[4], word32 out[4])
 	}
 }
 
-void Square::Base::UncheckedSetKey(CipherDir dir, const byte *userKey, unsigned int length)
+void Square::Base::UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &)
 {
 	AssertValidKeyLength(length);
 
@@ -52,7 +52,7 @@ void Square::Base::UncheckedSetKey(CipherDir dir, const byte *userKey, unsigned
 	}  
 
 	/* produce the round keys */
-	if (dir == ENCRYPTION)
+	if (IsForwardTransformation())
 	{
 		for (int i = 0; i < ROUNDS; i++)
 			SquareTransform (roundkeys[i], roundkeys[i]);