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@

5 files changed, 12 insertions, 21 deletions

diff --git a/src/lib/libcrypto/asn1/a_mbstr.c b/src/lib/libcrypto/asn1/a_mbstr.c
index b59d84910f..9945ede2ac 100644
--- a/src/lib/libcrypto/asn1/a_mbstr.c
+++ b/src/lib/libcrypto/asn1/a_mbstr.c
@@ -98,7 +98,6 @@ ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
         ASN1_STRING *dest;
         unsigned char *p;
         int nchar;
-        char strbuf[32];
         int (*cpyfunc)(unsigned long, void *) = NULL;
 
         if (len == -1)
@@ -148,15 +147,13 @@ ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
 
         if ((minsize > 0) && (nchar < minsize)) {
                 ASN1err(ASN1_F_ASN1_MBSTRING_NCOPY, ASN1_R_STRING_TOO_SHORT);
-                snprintf(strbuf, sizeof strbuf, "%ld", minsize);
-                ERR_add_error_data(2, "minsize=", strbuf);
+                ERR_asprintf_error_data("minsize=%ld", minsize);
                 return -1;
         }
 
         if ((maxsize > 0) && (nchar > maxsize)) {
                 ASN1err(ASN1_F_ASN1_MBSTRING_NCOPY, ASN1_R_STRING_TOO_LONG);
-                snprintf(strbuf, sizeof strbuf, "%ld", maxsize);
-                ERR_add_error_data(2, "maxsize=", strbuf);
+                ERR_asprintf_error_data("maxsize=%ld", maxsize);
                 return -1;
         }
 
diff --git a/src/lib/libcrypto/asn1/asn1_gen.c b/src/lib/libcrypto/asn1/asn1_gen.c
index c66bea2ab4..598a322242 100644
--- a/src/lib/libcrypto/asn1/asn1_gen.c
+++ b/src/lib/libcrypto/asn1/asn1_gen.c
@@ -291,7 +291,7 @@ asn1_cb(const char *elem, int len, void *bitstr)
 
         if (utype == -1) {
                 ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_TAG);
-                ERR_add_error_data(2, "tag=", elem);
+                ERR_asprintf_error_data("tag=%s", elem);
                 return -1;
         }
 
@@ -370,7 +370,6 @@ asn1_cb(const char *elem, int len, void *bitstr)
 static int
 parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
 {
-        char erch[2];
         long tag_num;
         char *eptr;
 
@@ -410,10 +409,8 @@ parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
                         break;
 
                 default:
-                        erch[0] = *eptr;
-                        erch[1] = 0;
                         ASN1err(ASN1_F_PARSE_TAGGING, ASN1_R_INVALID_MODIFIER);
-                        ERR_add_error_data(2, "Char=", erch);
+                        ERR_asprintf_error_data("Char=%c", *eptr);
                         return 0;
                         break;
 
@@ -777,7 +774,7 @@ asn1_str2type(const char *str, int format, int utype)
         return atmp;
 
 bad_str:
-        ERR_add_error_data(2, "string=", str);
+        ERR_asprintf_error_data("string=%s", str);
 bad_form:
         ASN1_TYPE_free(atmp);
         return NULL;
diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index 4d4368aefe..c2f0837a1c 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -459,10 +459,7 @@ ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
 void
 asn1_add_error(const unsigned char *address, int offset)
 {
-        char tmp[128];
-        (void) snprintf(tmp, sizeof(tmp), "address=%p offset=%d",
-            address, offset);
-        ERR_add_error_data(1, tmp);
+        ERR_asprintf_error_data("address=%p offset=%d", address, offset);
 }
 
 int
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c
index 248ea114e8..b30c366561 100644
--- a/src/lib/libcrypto/asn1/asn_mime.c
+++ b/src/lib/libcrypto/asn1/asn_mime.c
@@ -493,7 +493,7 @@ SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it)
                     strcmp(hdr->value, "application/pkcs7-signature")) {
                         ASN1err(ASN1_F_SMIME_READ_ASN1,
                             ASN1_R_SIG_INVALID_MIME_TYPE);
-                        ERR_add_error_data(2, "type: ", hdr->value);
+                        ERR_asprintf_error_data("type: %s", hdr->value);
                         sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
                         sk_BIO_pop_free(parts, BIO_vfree);
                         return NULL;
@@ -520,7 +520,7 @@ SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it)
         if (strcmp (hdr->value, "application/x-pkcs7-mime") &&
             strcmp (hdr->value, "application/pkcs7-mime")) {
                 ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_INVALID_MIME_TYPE);
-                ERR_add_error_data(2, "type: ", hdr->value);
+                ERR_asprintf_error_data("type: %s", hdr->value);
                 sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
                 return NULL;
         }
@@ -591,7 +591,7 @@ SMIME_text(BIO *in, BIO *out)
         }
         if (strcmp (hdr->value, "text/plain")) {
                 ASN1err(ASN1_F_SMIME_TEXT, ASN1_R_INVALID_MIME_TYPE);
-                ERR_add_error_data(2, "type: ", hdr->value);
+                ERR_asprintf_error_data("type: %s", hdr->value);
                 sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
                 return 0;
         }
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index 560b6f3d5f..d86bc4e091 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -496,10 +496,10 @@ auxerr:
 err:
         ASN1_item_ex_free(pval, it);
         if (errtt)
-                ERR_add_error_data(4, "Field=", errtt->field_name,
-                    ", Type=", it->sname);
+                ERR_asprintf_error_data("Field=%s, Type=%s", errtt->field_name,
+                    it->sname);
         else
-                ERR_add_error_data(2, "Type=", it->sname);
+                ERR_asprintf_error_data("Type=%s", it->sname);
         return 0;
 }