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/modes.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/modes.hpp')
| -rw-r--r-- | extra/yassl/taocrypt/include/modes.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/include/modes.hpp b/extra/yassl/taocrypt/include/modes.hpp index 2285bd0e845..5fd36b80d3e 100644 --- a/extra/yassl/taocrypt/include/modes.hpp +++ b/extra/yassl/taocrypt/include/modes.hpp @@ -61,9 +61,7 @@ public: explicit Mode_BASE(int sz, CipherDir dir, Mode mode) : blockSz_(sz), reg_(reinterpret_cast<byte*>(r_)), tmp_(reinterpret_cast<byte*>(t_)), dir_(dir), mode_(mode) - { - assert(sz <= MaxBlockSz); - } + {} virtual ~Mode_BASE() {} virtual void Process(byte*, const byte*, word32); @@ -96,8 +94,7 @@ inline void Mode_BASE::Process(byte* out, const byte* in, word32 sz) { if (mode_ == ECB) ECB_Process(out, in, sz); - else if (mode_ == CBC) - { + else if (mode_ == CBC) { if (dir_ == ENCRYPTION) CBC_Encrypt(out, in, sz); else |