summaryrefslogtreecommitdiff
path: root/extra/yassl/taocrypt/include
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-06-29 15:17:01 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-06-29 15:17:01 +0200
commit19dfaa5824ef47de51a568be4e7a30ff028bcbe8 (patch)
treec3d2d1b1efe2de7e702c3d65d8b7bddccbdbd5d0 /extra/yassl/taocrypt/include
parent5e0c653f03366a805a97aaec9e2268a7e4fe5241 (diff)
downloadmariadb-git-19dfaa5824ef47de51a568be4e7a30ff028bcbe8.tar.gz
Merge from 5.0-bt
Diffstat (limited to 'extra/yassl/taocrypt/include')
-rw-r--r--extra/yassl/taocrypt/include/modes.hpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/include/modes.hpp b/extra/yassl/taocrypt/include/modes.hpp
index d1ebce7568b..4575fe1414b 100644
--- a/extra/yassl/taocrypt/include/modes.hpp
+++ b/extra/yassl/taocrypt/include/modes.hpp
@@ -96,10 +96,12 @@ inline void Mode_BASE::Process(byte* out, const byte* in, word32 sz)
if (mode_ == ECB)
ECB_Process(out, in, sz);
else if (mode_ == CBC)
+ {
if (dir_ == ENCRYPTION)
CBC_Encrypt(out, in, sz);
else
CBC_Decrypt(out, in, sz);
+ }
}