resolve conflicts, fix local changes

1 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/libcrypto/evp/bio_md.c b/src/lib/libcrypto/evp/bio_md.c
index ed5c1135fd..9841e32e1a 100644
--- a/src/lib/libcrypto/evp/bio_md.c
+++ b/src/lib/libcrypto/evp/bio_md.c
@@ -130,8 +130,8 @@ static int md_read(BIO *b, char *out, int outl)
                 {
                 if (ret > 0)
                         {
-                        EVP_DigestUpdate(ctx,(unsigned char *)out,
-                                (unsigned int)ret);
+                        if (EVP_DigestUpdate(ctx,(unsigned char *)out,
+                                (unsigned int)ret)<=0) return (-1);
                         }
                 }
         BIO_clear_retry_flags(b);
@@ -157,8 +157,11 @@ static int md_write(BIO *b, const char *in, int inl)
                                 (unsigned int)ret);
                         }
                 }
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
+        if(b->next_bio != NULL)
+                {
+                BIO_clear_retry_flags(b);
+                BIO_copy_next_retry(b);
+                }
         return(ret);
         }
 
@@ -194,6 +197,7 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_C_GET_MD_CTX:
                 pctx=ptr;
                 *pctx=ctx;
+                b->init = 1;
                 break;
         case BIO_C_SET_MD_CTX:
                 if (b->init)
@@ -249,7 +253,9 @@ static int md_gets(BIO *bp, char *buf, int size)
         ctx=bp->ptr;
         if (size < ctx->digest->md_size)
                 return(0);
-        EVP_DigestFinal_ex(ctx,(unsigned char *)buf,&ret);
+        if (EVP_DigestFinal_ex(ctx,(unsigned char *)buf,&ret)<=0) 
+                return -1;
+                
         return((int)ret);
         }