summaryrefslogtreecommitdiff
path: root/extra/yassl/taocrypt/src
diff options
context:
space:
mode:
authordkatz@damien-katzs-computer.local <>2007-07-17 14:43:56 -0400
committerdkatz@damien-katzs-computer.local <>2007-07-17 14:43:56 -0400
commit491d945ab6766a1733c8963f50f04edad0713eb7 (patch)
tree22b683eb6b0bc6863cfd7e06fb3cf254ce906d90 /extra/yassl/taocrypt/src
parent8d7365a4b0b37bee191b3ec5a1f42f14f3741faf (diff)
downloadmariadb-git-491d945ab6766a1733c8963f50f04edad0713eb7.tar.gz
Bug #29784 YaSSL assertion failure when reading 8k key.
Fixed the yassl base64 decoding to correctly allocate a maximum decoded buffer size.
Diffstat (limited to 'extra/yassl/taocrypt/src')
-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 68055b3aff4..55fe31831e3 100644
--- a/extra/yassl/taocrypt/src/coding.cpp
+++ b/extra/yassl/taocrypt/src/coding.cpp
@@ -184,7 +184,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;