diff options
| author | beck <> | 2014-04-26 18:56:38 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-26 18:56:38 +0000 |
| commit | e7dbd7a1e2ad3e12dafa2919bc8603d60416ea4d (patch) | |
| tree | dff54039de6c4454b05953e2ce78edfc5693e6b5 /src/lib/libcrypto/engine/eng_cnf.c | |
| parent | a1c73b72875dcb25545f111b3779cf0f0ebf9c88 (diff) | |
| download | openbsd-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/engine/eng_cnf.c')
| -rw-r--r-- | src/lib/libcrypto/engine/eng_cnf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c index 95c4070015..afb704e93b 100644 --- a/src/lib/libcrypto/engine/eng_cnf.c +++ b/src/lib/libcrypto/engine/eng_cnf.c | |||
| @@ -203,9 +203,9 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf) | |||
| 203 | { | 203 | { |
| 204 | ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, ENGINE_R_ENGINE_CONFIGURATION_ERROR); | 204 | ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, ENGINE_R_ENGINE_CONFIGURATION_ERROR); |
| 205 | if (ecmd) | 205 | if (ecmd) |
| 206 | ERR_add_error_data(6, "section=", ecmd->section, | 206 | ERR_asprintf_error_data |
| 207 | ", name=", ecmd->name, | 207 | ("section=%s, name=%s, value=%s", |
| 208 | ", value=", ecmd->value); | 208 | ecmd->section, ecmd->name, ecmd->value); |
| 209 | } | 209 | } |
| 210 | if (e) | 210 | if (e) |
| 211 | ENGINE_free(e); | 211 | ENGINE_free(e); |
