diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2006-12-10 02:12:23 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2006-12-10 02:12:23 +0000 |
| commit | c3bad1afc1564f3bfac8434d45d6694811139333 (patch) | |
| tree | ebfbbcf4dffdf4914b9ce879d3d2c93d3615f7ab /rijndael.cpp | |
| parent | e553818e00684e8905ede16e53aa490c153b7e7a (diff) | |
| download | cryptopp-c3bad1afc1564f3bfac8434d45d6694811139333.tar.gz | |
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
Diffstat (limited to 'rijndael.cpp')
| -rw-r--r-- | rijndael.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rijndael.cpp b/rijndael.cpp index 7131e01..5749c59 100644 --- a/rijndael.cpp +++ b/rijndael.cpp @@ -54,7 +54,7 @@ being unloaded from L1 cache, until that round is finished. NAMESPACE_BEGIN(CryptoPP) -void Rijndael::Base::UncheckedSetKey(CipherDir dir, const byte *userKey, unsigned int keylen) +void Rijndael::Base::UncheckedSetKey(const byte *userKey, unsigned int keylen, const NameValuePairs &) { AssertValidKeyLength(keylen); @@ -103,7 +103,7 @@ void Rijndael::Base::UncheckedSetKey(CipherDir dir, const byte *userKey, unsigne rk += keylen/4; } - if (dir == DECRYPTION) + if (!IsForwardTransformation()) { unsigned int i, j; rk = m_key; |