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 | 724af49cf01c29dae55fb0b4b43d1d265cf4f3f1 (patch) | |
| tree | 729e10de198e048a97b7fb3ca2d62a16b98ee613 /extra/yassl/taocrypt/src/twofish.cpp | |
| parent | a25adb1cc830d7e263daa03560a129ac9cd6828a (diff) | |
| download | mariadb-git-724af49cf01c29dae55fb0b4b43d1d265cf4f3f1.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/src/twofish.cpp')
| -rw-r--r-- | extra/yassl/taocrypt/src/twofish.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/src/twofish.cpp b/extra/yassl/taocrypt/src/twofish.cpp index 272a0def169..4ff1304a4cd 100644 --- a/extra/yassl/taocrypt/src/twofish.cpp +++ b/extra/yassl/taocrypt/src/twofish.cpp @@ -140,8 +140,6 @@ inline word32 Twofish::h(word32 x, const word32* key, unsigned int kLen) void Twofish::SetKey(const byte* userKey, word32 keylen, CipherDir /*dummy*/) { - assert(keylen >= 16 && keylen <= 32); - unsigned int len = (keylen <= 16 ? 2 : (keylen <= 24 ? 3 : 4)); word32 key[8]; GetUserKey(LittleEndianOrder, key, len*2, userKey, keylen); |