Do no try to pretend we're at the end of anything unless we're at the end

of a 4-character block.

diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 2d738f4b0108fb8c0f98301d2080426dce7f8424..5921f0d710d8faed65c203cf180a7a4b320facb8 100644 (file)
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -313,7 +313,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
                        /* There will never be more than two '=' */
                        }
 
-               if ((v == B64_EOF) || (n >= 64))
+               if ((v == B64_EOF && (n&3) == 0) || (n >= 64))
                        {
                        /* This is needed to work correctly on 64 byte input
                         * lines.  We process the line and then need to