diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-10 16:33:27 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-10 16:33:27 +0200 |
| commit | 937302d6a887523c56331a7c05e68b71cf9abb7b (patch) | |
| tree | 729e10de198e048a97b7fb3ca2d62a16b98ee613 /extra/yassl/taocrypt/include/blowfish.hpp | |
| parent | d3de138311dd7fcabf2ade7b2c024c3edcab5094 (diff) | |
| download | mariadb-git-937302d6a887523c56331a7c05e68b71cf9abb7b.tar.gz | |
Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4
$SUBJ$
1. Took a diff between the previous base version and the
mysql sources.
2. Added the new 2.1.4 base version.
3. Reviewed and re-applied the diff from step #1.
Diffstat (limited to 'extra/yassl/taocrypt/include/blowfish.hpp')
| -rw-r--r-- | extra/yassl/taocrypt/include/blowfish.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/yassl/taocrypt/include/blowfish.hpp b/extra/yassl/taocrypt/include/blowfish.hpp index 99d932353df..3ad2aedc587 100644 --- a/extra/yassl/taocrypt/include/blowfish.hpp +++ b/extra/yassl/taocrypt/include/blowfish.hpp @@ -59,11 +59,11 @@ public: void SetKey(const byte* key, word32 sz, CipherDir fake = ENCRYPTION); void SetIV(const byte* iv) { memcpy(r_, iv, BLOCK_SIZE); } private: - static const word32 p_init_[ROUNDS + 2]; - static const word32 s_init_[4 * 256]; + static const word32 p_init_[ROUNDS + 2]; + static const word32 s_init_[4 * 256]; - word32 pbox_[ROUNDS + 2 + 4 * 256]; - word32* sbox_; + word32 pbox_[ROUNDS + 2 + 4 * 256]; + word32* sbox_; void crypt_block(const word32 in[2], word32 out[2]) const; void AsmProcess(const byte* in, byte* out) const; |