1 files changed, 8 insertions, 9 deletions

diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c
index afe16afbe4..ed0252d7d7 100644
--- a/src/lib/libcrypto/ts/ts_rsp_verify.c
+++ b/src/lib/libcrypto/ts/ts_rsp_verify.c
@@ -509,15 +509,17 @@ static int TS_check_status_info(TS_RESP *response)
                                                     TS_failure_info[i].code))
                                 {
                                 if (!first)
-                                        strcpy(failure_text, ",");
+                                        strlcat(failure_text, ",",
+                                                TS_STATUS_BUF_SIZE);
                                 else
                                         first = 0;
-                                strcat(failure_text, TS_failure_info[i].text);
+                                strlcat(failure_text, TS_failure_info[i].text,
+                                        TS_STATUS_BUF_SIZE);
                                 }
                         }
                 }
         if (failure_text[0] == '\0')
-                strcpy(failure_text, "unspecified");
+                strlcpy(failure_text, "unspecified", TS_STATUS_BUF_SIZE);
 
         /* Making up the error string. */
         TSerr(TS_F_TS_CHECK_STATUS_INFO, TS_R_NO_TIME_STAMP_TOKEN);
@@ -614,15 +616,12 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
                 goto err;
                 }
 
-        if (!EVP_DigestInit(&md_ctx, md))
-                goto err;
+        EVP_DigestInit(&md_ctx, md);
         while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0)
                 {
-                if (!EVP_DigestUpdate(&md_ctx, buffer, length))
-                        goto err;
+                EVP_DigestUpdate(&md_ctx, buffer, length);
                 }
-        if (!EVP_DigestFinal(&md_ctx, *imprint, NULL))
-                goto err;
+        EVP_DigestFinal(&md_ctx, *imprint, NULL);
 
         return 1;
  err: