5 files changed, 15 insertions, 16 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c
index 6d5c576e23..a5d760d469 100644
--- a/src/lib/libcrypto/x509v3/v3_akey.c
+++ b/src/lib/libcrypto/x509v3/v3_akey.c
@@ -139,7 +139,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                 } else {
                         X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
                             X509V3_R_UNKNOWN_OPTION);
-                        ERR_add_error_data(2, "name=", cnf->name);
+                        ERR_asprintf_error_data("name=%s", cnf->name);
                         return NULL;
                 }
         }
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index e61ed673c0..61b0c90fad 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -479,7 +479,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
                         if (!(obj = OBJ_txt2obj(value, 0))) {
                                 X509V3err(X509V3_F_A2I_GENERAL_NAME,
                                     X509V3_R_BAD_OBJECT);
-                                ERR_add_error_data(2, "value=", value);
+                                ERR_asprintf_error_data("value=%s", value);
                                 goto err;
                         }
                         gen->d.rid = obj;
@@ -494,7 +494,7 @@ a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
                 if (gen->d.ip == NULL) {
                         X509V3err(X509V3_F_A2I_GENERAL_NAME,
                             X509V3_R_BAD_IP_ADDRESS);
-                        ERR_add_error_data(2, "value=", value);
+                        ERR_asprintf_error_data("value=%s", value);
                         goto err;
                 }
                 break;
@@ -572,7 +572,7 @@ v2i_GENERAL_NAME_ex(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
         else {
                 X509V3err(X509V3_F_V2I_GENERAL_NAME_EX,
                     X509V3_R_UNSUPPORTED_OPTION);
-                ERR_add_error_data(2, "name=", name);
+                ERR_asprintf_error_data("name=%s", name);
                 return NULL;
         }
 
@@ -620,7 +620,7 @@ do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
         sk = X509V3_get_section(ctx, value);
         if (!sk) {
                 X509V3err(X509V3_F_DO_DIRNAME, X509V3_R_SECTION_NOT_FOUND);
-                ERR_add_error_data(2, "section=", value);
+                ERR_asprintf_error_data("section=%s", value);
                 X509_NAME_free(nm);
                 return 0;
         }
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c
index daacf8d5df..e22aa50fcd 100644
--- a/src/lib/libcrypto/x509v3/v3_conf.c
+++ b/src/lib/libcrypto/x509v3/v3_conf.c
@@ -94,7 +94,7 @@ X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name, char *value)
         if (!ret) {
                 X509V3err(X509V3_F_X509V3_EXT_NCONF,
                     X509V3_R_ERROR_IN_EXTENSION);
-                ERR_add_error_data(4, "name=", name, ", value=", value);
+                ERR_asprintf_error_data("name=%s, value=%s", name, value);
         }
         return ret;
 }
@@ -142,8 +142,8 @@ do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value)
                 if (sk_CONF_VALUE_num(nval) <= 0) {
                         X509V3err(X509V3_F_DO_EXT_NCONF,
                             X509V3_R_INVALID_EXTENSION_STRING);
-                        ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid),
-                            ",section=", value);
+                        ERR_asprintf_error_data("name=%s,section=%s",
+                            OBJ_nid2sn(ext_nid), value);
                         return NULL;
                 }
                 ext_struc = method->v2i(method, ctx, nval);
@@ -165,7 +165,7 @@ do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value)
         } else {
                 X509V3err(X509V3_F_DO_EXT_NCONF,
                     X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED);
-                ERR_add_error_data(2, "name=", OBJ_nid2sn(ext_nid));
+                ERR_asprintf_error_data("name=%s", OBJ_nid2sn(ext_nid));
                 return NULL;
         }
 
@@ -283,7 +283,7 @@ v3_generic_extension(const char *ext, char *value, int crit, int gen_type,
         if (!(obj = OBJ_txt2obj(ext, 0))) {
                 X509V3err(X509V3_F_V3_GENERIC_EXTENSION,
                     X509V3_R_EXTENSION_NAME_ERROR);
-                ERR_add_error_data(2, "name=", ext);
+                ERR_asprintf_error_data("name=%s", ext);
                 goto err;
         }
 
@@ -295,7 +295,7 @@ v3_generic_extension(const char *ext, char *value, int crit, int gen_type,
         if (ext_der == NULL) {
                 X509V3err(X509V3_F_V3_GENERIC_EXTENSION,
                     X509V3_R_EXTENSION_VALUE_ERROR);
-                ERR_add_error_data(2, "value=", value);
+                ERR_asprintf_error_data("value=%s", value);
                 goto err;
         }
 
diff --git a/src/lib/libcrypto/x509v3/v3_info.c b/src/lib/libcrypto/x509v3/v3_info.c
index 7853e3e23b..9ae1596b1f 100644
--- a/src/lib/libcrypto/x509v3/v3_info.c
+++ b/src/lib/libcrypto/x509v3/v3_info.c
@@ -184,12 +184,10 @@ v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
                 if (!acc->method) {
                         X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
                             X509V3_R_BAD_OBJECT);
-                        ERR_add_error_data(2, "value=", objtmp);
-                        free(objtmp);
+                        ERR_asprintf_error_data("value=%s", objtmp);
                         goto err;
                 }
                 free(objtmp);
-
         }
         return ainfo;
 
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h
index b308abe7cd..dda5344b33 100644
--- a/src/lib/libcrypto/x509v3/x509v3.h
+++ b/src/lib/libcrypto/x509v3/x509v3.h
@@ -379,8 +379,9 @@ struct ISSUING_DIST_POINT_st
 /* onlysomereasons present */
 #define IDP_REASONS     0x40
 
-#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
-",name:", val->name, ",value:", val->value);
+#define X509V3_conf_err(val) ERR_asprintf_error_data( \
+                        "section:%s,name:%s,value:%s", val->section, \
+                        val->name, val->value);
 
 #define X509V3_set_ctx_test(ctx) \
                         X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)