1 files changed, 7 insertions, 8 deletions

diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c
index cb54cc2a87..9f252385e8 100644
--- a/src/lib/libcrypto/conf/conf_mod.c
+++ b/src/lib/libcrypto/conf/conf_mod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_mod.c,v 1.26 2015/04/11 16:03:21 deraadt Exp $ */
+/* $OpenBSD: conf_mod.c,v 1.27 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -211,7 +211,7 @@ module_run(const CONF *cnf, char *name, char *value, unsigned long flags)
 
         if (!md) {
                 if (!(flags & CONF_MFLAGS_SILENT)) {
-                        CONFerr(CONF_F_MODULE_RUN, CONF_R_UNKNOWN_MODULE_NAME);
+                        CONFerror(CONF_R_UNKNOWN_MODULE_NAME);
                         ERR_asprintf_error_data("module=%s", name);
                 }
                 return -1;
@@ -221,8 +221,7 @@ module_run(const CONF *cnf, char *name, char *value, unsigned long flags)
 
         if (ret <= 0) {
                 if (!(flags & CONF_MFLAGS_SILENT)) {
-                        CONFerr(CONF_F_MODULE_RUN,
-                            CONF_R_MODULE_INITIALIZATION_ERROR);
+                        CONFerror(CONF_R_MODULE_INITIALIZATION_ERROR);
                         ERR_asprintf_error_data
                             ("module=%s, value=%s, retcode=%-8d",
                             name, value, ret);
@@ -271,7 +270,7 @@ module_load_dso(const CONF *cnf, char *name, char *value, unsigned long flags)
 err:
         if (dso)
                 DSO_free(dso);
-        CONFerr(CONF_F_MODULE_LOAD_DSO, errcode);
+        CONFerror(errcode);
         ERR_asprintf_error_data("module=%s, path=%s", name, path);
         return NULL;
 }
@@ -368,13 +367,13 @@ module_init(CONF_MODULE *pmod, char *name, char *value, const CONF *cnf)
         if (initialized_modules == NULL) {
                 initialized_modules = sk_CONF_IMODULE_new_null();
                 if (!initialized_modules) {
-                        CONFerr(CONF_F_MODULE_INIT, ERR_R_MALLOC_FAILURE);
+                        CONFerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
         }
 
         if (!sk_CONF_IMODULE_push(initialized_modules, imod)) {
-                CONFerr(CONF_F_MODULE_INIT, ERR_R_MALLOC_FAILURE);
+                CONFerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -566,7 +565,7 @@ CONF_parse_list(const char *list_, int sep, int nospc,
         const char *lstart, *tmpend, *p;
 
         if (list_ == NULL) {
-                CONFerr(CONF_F_CONF_PARSE_LIST, CONF_R_LIST_CANNOT_BE_NULL);
+                CONFerror(CONF_R_LIST_CANNOT_BE_NULL);
                 return 0;
         }