resolve conflicts

1 files changed, 6 insertions, 3 deletions

diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c
index ed0252d7d7..a003207428 100644
--- a/src/lib/libcrypto/ts/ts_rsp_verify.c
+++ b/src/lib/libcrypto/ts/ts_rsp_verify.c
@@ -616,12 +616,15 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
                 goto err;
                 }
 
-        EVP_DigestInit(&md_ctx, md);
+        if (!EVP_DigestInit(&md_ctx, md))
+                goto err;
         while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0)
                 {
-                EVP_DigestUpdate(&md_ctx, buffer, length);
+                if (!EVP_DigestUpdate(&md_ctx, buffer, length))
+                        goto err;
                 }
-        EVP_DigestFinal(&md_ctx, *imprint, NULL);
+        if (!EVP_DigestFinal(&md_ctx, *imprint, NULL))
+                goto err;
 
         return 1;
  err: