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, 3 deletions

diff --git a/rc6.cpp b/rc6.cpp
index 9a39d49..e58cb6a 100644
--- a/rc6.cpp
+++ b/rc6.cpp
@@ -7,12 +7,11 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
-void RC6::Base::UncheckedSetKey(CipherDir direction, const byte *k, unsigned int keylen, unsigned int rounds)
+void RC6::Base::UncheckedSetKey(const byte *k, unsigned int keylen, const NameValuePairs &params)
 {
 	AssertValidKeyLength(keylen);
-	AssertValidRounds(rounds);
 
-	r = rounds;
+	r = GetRoundsAndThrowIfInvalid(params, this);
 	sTable.New(2*(r+2));
 
 	static const RC6_WORD MAGIC_P = 0xb7e15163L;    // magic constant P for wordsize