resolve conflicts

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/a_digest.c b/src/lib/libcrypto/asn1/a_digest.c
index d00d9e22b1..cbdeea6ac0 100644
--- a/src/lib/libcrypto/asn1/a_digest.c
+++ b/src/lib/libcrypto/asn1/a_digest.c
@@ -87,7 +87,8 @@ int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
         p=str;
         i2d(data,&p);
 
-        EVP_Digest(str, i, md, len, type, NULL);
+        if (!EVP_Digest(str, i, md, len, type, NULL))
+                return 0;
         OPENSSL_free(str);
         return(1);
         }
@@ -104,7 +105,8 @@ int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn,
         i=ASN1_item_i2d(asn,&str, it);
         if (!str) return(0);
 
-        EVP_Digest(str, i, md, len, type, NULL);
+        if (!EVP_Digest(str, i, md, len, type, NULL))
+                return 0;
         OPENSSL_free(str);
         return(1);
         }