2 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index 591bfbec33..cdac3b870d 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -830,7 +830,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
         cms_fixup_mctx(&mctx, si->pkey);
         r = EVP_VerifyFinal(&mctx,
                         si->signature->data, si->signature->length, si->pkey);
-        if (!r)
+        if (r <= 0)
                 CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);
         err:
         EVP_MD_CTX_cleanup(&mctx);
diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c
index f79c504e91..b9463f9abb 100644
--- a/src/lib/libcrypto/cms/cms_smime.c
+++ b/src/lib/libcrypto/cms/cms_smime.c
@@ -68,7 +68,10 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
         if (out == NULL)
                 tmpout = BIO_new(BIO_s_null());
         else if (flags & CMS_TEXT)
+                {
                 tmpout = BIO_new(BIO_s_mem());
+                BIO_set_mem_eof_return(tmpout, 0);
+                }
         else
                 tmpout = out;
 
@@ -89,11 +92,13 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
                                 if (!BIO_get_cipher_status(in))
                                         goto err;
                                 }
+                        if (i < 0)
+                                goto err;
                         break;
                         }
                                 
-                if (tmpout)
-                        BIO_write(tmpout, buf, i);
+                if (tmpout && (BIO_write(tmpout, buf, i) != i))
+                        goto err;
         }
 
         if(flags & CMS_TEXT)