From 8922d4bc4a8b8893d72a48deb2cdf58215f98505 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 1 Oct 2010 22:59:01 +0000
Subject: resolve conflicts, fix local changes

---
 src/lib/libcrypto/ts/ts_rsp_verify.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/ts')

diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c
index e1f3b534af..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);
-- 
cgit v1.2.3-55-g6feb