summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509
diff options
context:
space:
mode:
authorbeck <>2014-04-26 18:56:38 +0000
committerbeck <>2014-04-26 18:56:38 +0000
commit47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2 (patch)
treedff54039de6c4454b05953e2ce78edfc5693e6b5 /src/lib/libcrypto/x509
parent8f710803a9e330d7e3f2e62116ae5b3fc02bd6cf (diff)
downloadopenbsd-47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2.tar.gz
openbsd-47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2.tar.bz2
openbsd-47bb6e76785f0b1c4d19d8d0a02f3eb3813f96e2.zip
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@
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r--src/lib/libcrypto/x509/x509_att.c2
-rw-r--r--src/lib/libcrypto/x509/x509name.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index 5699568998..ef922c7c83 100644
--- a/src/lib/libcrypto/x509/x509_att.c
+++ b/src/lib/libcrypto/x509/x509_att.c
@@ -282,7 +282,7 @@ X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname,
282 if (obj == NULL) { 282 if (obj == NULL) {
283 X509err(X509_F_X509_ATTRIBUTE_CREATE_BY_TXT, 283 X509err(X509_F_X509_ATTRIBUTE_CREATE_BY_TXT,
284 X509_R_INVALID_FIELD_NAME); 284 X509_R_INVALID_FIELD_NAME);
285 ERR_add_error_data(2, "name=", atrname); 285 ERR_asprintf_error_data("name=%s", atrname);
286 return (NULL); 286 return (NULL);
287 } 287 }
288 nattr = X509_ATTRIBUTE_create_by_OBJ(attr, obj, type, bytes, len); 288 nattr = X509_ATTRIBUTE_create_by_OBJ(attr, obj, type, bytes, len);
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index 3d90fd67fe..32fce2debb 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -298,7 +298,7 @@ X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
298 if (obj == NULL) { 298 if (obj == NULL) {
299 X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT, 299 X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,
300 X509_R_INVALID_FIELD_NAME); 300 X509_R_INVALID_FIELD_NAME);
301 ERR_add_error_data(2, "name=", field); 301 ERR_asprintf_error_data("name=%s", field);
302 return (NULL); 302 return (NULL);
303 } 303 }
304 nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len); 304 nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);