Fix faulty base64 decoding of data that was 46 or 47 bytes long.

Submitted by: Ivan Nejgebauer <ian@uns.ns.ac.yu>

diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 0152624a7691545fb722e50d75ae2722f7c1ba9e..110435d5dfc4911e4155c01d50872550026b9039 100644 (file)
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -294,12 +294,12 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
                if (((i+1) == inl) && (((n&3) == 0) || eof))
                        v=B64_EOF;
 
                if (((i+1) == inl) && (((n&3) == 0) || eof))
                        v=B64_EOF;
 

-               if ((v == B64_EOF) || (n >= 64))
+               if ((v == B64_EOF) || (n >= 68))

                        {
                        /* This is needed to work correctly on 64 byte input
                         * lines.  We process the line and then need to
                         * accept the '\n' */
                        {
                        /* This is needed to work correctly on 64 byte input
                         * lines.  We process the line and then need to
                         * accept the '\n' */

-                       if ((v != B64_EOF) && (n >= 64)) exp_nl=1;
+                       if ((v != B64_EOF) && (n >= 68)) exp_nl=1;

                        tmp2=v;
                        if (n > 0)
                                {
                        tmp2=v;
                        if (n > 0)
                                {