summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-28 12:59:19 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-28 12:59:19 -0300
commitccf6ec093e14e6a5eb0fc15c9f365bae9d1a57f6 (patch)
tree579cf461ed529f9ee26fa1b531c1e513b426074b /extra
parent2aee4d8ddd736642488c5ed32fe2d2fd46061596 (diff)
downloadmariadb-git-ccf6ec093e14e6a5eb0fc15c9f365bae9d1a57f6.tar.gz
Bug#53463: YaSSL patch appears to be reverted
The problem is that the fix Bug#29784 was mistakenly reverted when updating YaSSL to a newer version. The solution is to re-apply the fix and this time actually add a meaningful test case so that possible regressions are caught.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/src/coding.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/coding.cpp b/extra/yassl/taocrypt/src/coding.cpp
index 7a9d50aaac9..7fc681e1a05 100644
--- a/extra/yassl/taocrypt/src/coding.cpp
+++ b/extra/yassl/taocrypt/src/coding.cpp
@@ -185,7 +185,7 @@ void Base64Decoder::Decode()
{
word32 bytes = coded_.size();
word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz);
- plainSz = (plainSz * 3 + 3) / 4;
+ plainSz = ((plainSz * 3) / 4) + 3;
decoded_.New(plainSz);
word32 i = 0;