diff options
Diffstat (limited to 'src/lib/libcrypto/engine/eng_cnf.c')
-rw-r--r-- | src/lib/libcrypto/engine/eng_cnf.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c index acdebda6a6..2ac077d492 100644 --- a/src/lib/libcrypto/engine/eng_cnf.c +++ b/src/lib/libcrypto/engine/eng_cnf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_cnf.c,v 1.13 2015/02/11 03:19:37 doug Exp $ */ | 1 | /* $OpenBSD: eng_cnf.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */ |
2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -115,8 +115,7 @@ int_engine_configure(char *name, char *value, const CONF *cnf) | |||
115 | ecmds = NCONF_get_section(cnf, value); | 115 | ecmds = NCONF_get_section(cnf, value); |
116 | 116 | ||
117 | if (!ecmds) { | 117 | if (!ecmds) { |
118 | ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, | 118 | ENGINEerror(ENGINE_R_ENGINE_SECTION_ERROR); |
119 | ENGINE_R_ENGINE_SECTION_ERROR); | ||
120 | return 0; | 119 | return 0; |
121 | } | 120 | } |
122 | 121 | ||
@@ -175,8 +174,7 @@ int_engine_configure(char *name, char *value, const CONF *cnf) | |||
175 | if (!int_engine_init(e)) | 174 | if (!int_engine_init(e)) |
176 | goto err; | 175 | goto err; |
177 | } else if (do_init != 0) { | 176 | } else if (do_init != 0) { |
178 | ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, | 177 | ENGINEerror(ENGINE_R_INVALID_INIT_VALUE); |
179 | ENGINE_R_INVALID_INIT_VALUE); | ||
180 | goto err; | 178 | goto err; |
181 | } | 179 | } |
182 | } | 180 | } |
@@ -196,8 +194,7 @@ int_engine_configure(char *name, char *value, const CONF *cnf) | |||
196 | 194 | ||
197 | err: | 195 | err: |
198 | if (ret != 1) { | 196 | if (ret != 1) { |
199 | ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, | 197 | ENGINEerror(ENGINE_R_ENGINE_CONFIGURATION_ERROR); |
200 | ENGINE_R_ENGINE_CONFIGURATION_ERROR); | ||
201 | if (ecmd) | 198 | if (ecmd) |
202 | ERR_asprintf_error_data( | 199 | ERR_asprintf_error_data( |
203 | "section=%s, name=%s, value=%s", | 200 | "section=%s, name=%s, value=%s", |
@@ -224,8 +221,7 @@ int_engine_module_init(CONF_IMODULE *md, const CONF *cnf) | |||
224 | elist = NCONF_get_section(cnf, CONF_imodule_get_value(md)); | 221 | elist = NCONF_get_section(cnf, CONF_imodule_get_value(md)); |
225 | 222 | ||
226 | if (!elist) { | 223 | if (!elist) { |
227 | ENGINEerr(ENGINE_F_INT_ENGINE_MODULE_INIT, | 224 | ENGINEerror(ENGINE_R_ENGINES_SECTION_ERROR); |
228 | ENGINE_R_ENGINES_SECTION_ERROR); | ||
229 | return 0; | 225 | return 0; |
230 | } | 226 | } |
231 | 227 | ||