diff options
author | dkatz@damien-katzs-computer.local <> | 2007-07-19 13:36:37 -0400 |
---|---|---|
committer | dkatz@damien-katzs-computer.local <> | 2007-07-19 13:36:37 -0400 |
commit | d81c502b8fb132556140d1363b64c32148b371c5 (patch) | |
tree | 744b03cfe307d2d58b0781907444bf5cd2d2b827 /extra | |
parent | 27ef95237dd3fe5bd226d4c2fa8cf67fb70fb3e9 (diff) | |
parent | 8ca3dc331102d6b77dd3bb991e4d58cc6f271bb2 (diff) | |
download | mariadb-git-d81c502b8fb132556140d1363b64c32148b371c5.tar.gz |
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
Diffstat (limited to 'extra')
-rw-r--r-- | extra/yassl/taocrypt/src/coding.cpp | 2 |
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; |