diff options
| author | unknown <dkatz@damien-katzs-computer.local> | 2007-07-19 13:36:37 -0400 |
|---|---|---|
| committer | unknown <dkatz@damien-katzs-computer.local> | 2007-07-19 13:36:37 -0400 |
| commit | ffcf1c372fe405b0fefb350a1b62f466666cbc3c (patch) | |
| tree | 744b03cfe307d2d58b0781907444bf5cd2d2b827 /extra/yassl | |
| parent | c1d12ec726fe27040730a9b3adbbbc14d14d9e9f (diff) | |
| parent | 04aba6ec5d0dc4206b0c74078ad30dd5dcc06bee (diff) | |
| download | mariadb-git-ffcf1c372fe405b0fefb350a1b62f466666cbc3c.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'extra/yassl')
| -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; |