summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/tasn_dec.c
diff options
context:
space:
mode:
authorbeck <>2014-04-26 18:56:38 +0000
committerbeck <>2014-04-26 18:56:38 +0000
commite7dbd7a1e2ad3e12dafa2919bc8603d60416ea4d (patch)
treedff54039de6c4454b05953e2ce78edfc5693e6b5 /src/lib/libcrypto/asn1/tasn_dec.c
parenta1c73b72875dcb25545f111b3779cf0f0ebf9c88 (diff)
downloadopenbsd-e7dbd7a1e2ad3e12dafa2919bc8603d60416ea4d.tar.gz
openbsd-e7dbd7a1e2ad3e12dafa2919bc8603d60416ea4d.tar.bz2
openbsd-e7dbd7a1e2ad3e12dafa2919bc8603d60416ea4d.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/asn1/tasn_dec.c')
-rw-r--r--src/lib/libcrypto/asn1/tasn_dec.c6
1 files changed, 3 insertions, 3 deletions
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:
496err: 496err:
497 ASN1_item_ex_free(pval, it); 497 ASN1_item_ex_free(pval, it);
498 if (errtt) 498 if (errtt)
499 ERR_add_error_data(4, "Field=", errtt->field_name, 499 ERR_asprintf_error_data("Field=%s, Type=%s", errtt->field_name,
500 ", Type=", it->sname); 500 it->sname);
501 else 501 else
502 ERR_add_error_data(2, "Type=", it->sname); 502 ERR_asprintf_error_data("Type=%s", it->sname);
503 return 0; 503 return 0;
504} 504}
505 505