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 /blowfish.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 'blowfish.cpp')
-rw-r--r-- | blowfish.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/blowfish.cpp b/blowfish.cpp index fa6c723..aaa637c 100644 --- a/blowfish.cpp +++ b/blowfish.cpp @@ -6,7 +6,7 @@ NAMESPACE_BEGIN(CryptoPP) -void Blowfish::Base::UncheckedSetKey(CipherDir dir, const byte *key_string, unsigned int keylength) +void Blowfish::Base::UncheckedSetKey(const byte *key_string, unsigned int keylength, const NameValuePairs &) { AssertValidKeyLength(keylength); @@ -35,7 +35,7 @@ void Blowfish::Base::UncheckedSetKey(CipherDir dir, const byte *key_string, unsi for (i=0; i<4*256-2; i+=2) crypt_block(sbox+i, sbox+i+2); - if (dir==DECRYPTION) + if (!IsForwardTransformation()) for (i=0; i<(ROUNDS+2)/2; i++) std::swap(pbox[i], pbox[ROUNDS+1-i]); } |