resolve conflicts

1 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/libcrypto/evp/bio_md.c b/src/lib/libcrypto/evp/bio_md.c
index 9841e32e1a..144fdfd56a 100644
--- a/src/lib/libcrypto/evp/bio_md.c
+++ b/src/lib/libcrypto/evp/bio_md.c
@@ -153,8 +153,12 @@ static int md_write(BIO *b, const char *in, int inl)
                 {
                 if (ret > 0)
                         {
-                        EVP_DigestUpdate(ctx,(const unsigned char *)in,
-                                (unsigned int)ret);
+                        if (!EVP_DigestUpdate(ctx,(const unsigned char *)in,
+                                (unsigned int)ret))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
                         }
                 }
         if(b->next_bio != NULL)
@@ -220,7 +224,8 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_CTRL_DUP:
                 dbio=ptr;
                 dctx=dbio->ptr;
-                EVP_MD_CTX_copy_ex(dctx,ctx);
+                if (!EVP_MD_CTX_copy_ex(dctx,ctx))
+                        return 0;
                 b->init=1;
                 break;
         default: