summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/crypto/x509v3/x509v3.h
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/libssl/src/crypto/x509v3/x509v3.h
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/libssl/src/crypto/x509v3/x509v3.h')
-rw-r--r--src/lib/libssl/src/crypto/x509v3/x509v3.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/src/crypto/x509v3/x509v3.h b/src/lib/libssl/src/crypto/x509v3/x509v3.h
index b308abe7cd..dda5344b33 100644
--- a/src/lib/libssl/src/crypto/x509v3/x509v3.h
+++ b/src/lib/libssl/src/crypto/x509v3/x509v3.h
@@ -379,8 +379,9 @@ struct ISSUING_DIST_POINT_st
379/* onlysomereasons present */ 379/* onlysomereasons present */
380#define IDP_REASONS 0x40 380#define IDP_REASONS 0x40
381 381
382#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \ 382#define X509V3_conf_err(val) ERR_asprintf_error_data( \
383",name:", val->name, ",value:", val->value); 383 "section:%s,name:%s,value:%s", val->section, \
384 val->name, val->value);
384 385
385#define X509V3_set_ctx_test(ctx) \ 386#define X509V3_set_ctx_test(ctx) \
386 X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST) 387 X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)