1 files changed, 17 insertions, 1 deletions

diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c
index 84729119df..bd5e24f993 100644
--- a/src/lib/libcrypto/evp/bio_b64.c
+++ b/src/lib/libcrypto/evp/bio_b64.c
@@ -69,6 +69,7 @@ static int b64_read(BIO *h,char *buf,int size);
 static long b64_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int b64_new(BIO *h);
 static int b64_free(BIO *data);
+static long b64_callback_ctrl(BIO *h,int cmd,void (*fp)());
 #define B64_BLOCK_SIZE  1024
 #define B64_BLOCK_SIZE2 768
 #define B64_NONE        0
@@ -100,6 +101,7 @@ static BIO_METHOD methods_b64=
         b64_ctrl,
         b64_new,
         b64_free,
+        b64_callback_ctrl,
         };
 
 BIO_METHOD *BIO_f_base64(void)
@@ -237,8 +239,8 @@ static int b64_read(BIO *b, char *out, int outl)
                                                         &(ctx->tmp[0]));
                                                 for (x=0; x < i; x++)
                                                         ctx->tmp[x]=p[x];
-                                                EVP_DecodeInit(&ctx->base64);
                                                 }
+                                        EVP_DecodeInit(&ctx->base64);
                                         ctx->start=0;
                                         break;
                                         }
@@ -522,3 +524,17 @@ again:
         return(ret);
         }
 
+static long b64_callback_ctrl(BIO *b, int cmd, void (*fp)())
+        {
+        long ret=1;
+
+        if (b->next_bio == NULL) return(0);
+        switch (cmd)
+                {
+        default:
+                ret=BIO_callback_ctrl(b->next_bio,cmd,fp);
+                break;
+                }
+        return(ret);
+        }
+