From 47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sat, 26 Apr 2014 18:56:38 +0000
Subject: Replace all use of ERR_add_error_data with ERR_asprintf_error_data.
 This avoids a lot of ugly gymnastics to do snprintfs before sending the bag
 of strings to ERR, and eliminates at least one place in dso_dlfctn.c where it
 was being called with the incorrect number of arguments and using random
 things off the stack as addresses of strings. ok krw@, jsing@

---
 src/lib/libcrypto/ts/ts_conf.c       |  2 +-
 src/lib/libcrypto/ts/ts_rsp_verify.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c
index f8cf3b514c..12cce16bc8 100644
--- a/src/lib/libcrypto/ts/ts_conf.c
+++ b/src/lib/libcrypto/ts/ts_conf.c
@@ -239,7 +239,7 @@ err:
 	if (!ret) {
 		TSerr(TS_F_TS_CONF_SET_DEFAULT_ENGINE,
 		    TS_R_COULD_NOT_SET_ENGINE);
-		ERR_add_error_data(2, "engine:", name);
+		ERR_asprintf_error_data("engine:%s", name);
 	}
 	if (e)
 		ENGINE_free(e);
diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c
index 66e35dab3a..2a4c0c5ef9 100644
--- a/src/lib/libcrypto/ts/ts_rsp_verify.c
+++ b/src/lib/libcrypto/ts/ts_rsp_verify.c
@@ -244,7 +244,7 @@ TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted, X509 *signer,
 	if (i <= 0) {
 		int j = X509_STORE_CTX_get_error(&cert_ctx);
 		TSerr(TS_F_TS_VERIFY_CERT, TS_R_CERTIFICATE_VERIFY_ERROR);
-		ERR_add_error_data(2, "Verify error:",
+		ERR_asprintf_error_data("Verify error:%s",
 		    X509_verify_cert_error_string(j));
 		ret = 0;
 	} else {
@@ -530,11 +530,11 @@ TS_check_status_info(TS_RESP *response)
 
 	/* Making up the error string. */
 	TSerr(TS_F_TS_CHECK_STATUS_INFO, TS_R_NO_TIME_STAMP_TOKEN);
-	ERR_add_error_data(6,
-	    "status code: ", status_text,
-	    ", status text: ", embedded_status_text ?
-	    embedded_status_text : "unspecified",
-	    ", failure codes: ", failure_text);
+	ERR_asprintf_error_data
+	    ("status code: %s, status text: %s, failure codes: %s",
+	    status_text,
+	    embedded_status_text ? embedded_status_text : "unspecified",
+	    failure_text);
 	free(embedded_status_text);
 
 	return 0;
-- 
cgit v1.2.3-55-g6feb