diff options
author | weidai <weidai11@users.noreply.github.com> | 2006-12-10 02:12:23 +0000 |
---|---|---|
committer | weidai <weidai11@users.noreply.github.com> | 2006-12-10 02:12:23 +0000 |
commit | f05ea58bb369988a61438411539ea955e0adf8c2 (patch) | |
tree | ebfbbcf4dffdf4914b9ce879d3d2c93d3615f7ab /blowfish.cpp | |
parent | 28c392e08234698cbe0e5fc3ffb3cfa5af1bc461 (diff) | |
download | cryptopp-git-f05ea58bb369988a61438411539ea955e0adf8c2.tar.gz |
port to GCC 4, reorganize implementations of SetKey
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 fa6c7238..aaa637cc 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]); } |