1 files changed, 76 insertions, 82 deletions

diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c
index afb704e93b..c0c6b3fdc4 100644
--- a/src/lib/libcrypto/engine/eng_cnf.c
+++ b/src/lib/libcrypto/engine/eng_cnf.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -63,34 +63,37 @@
 
 /* ENGINE config module */
 
-static char *skip_dot(char *name)
-        {
+static char *
+skip_dot(char *name)
+{
         char *p;
+
         p = strchr(name, '.');
         if (p)
                 return p + 1;
         return name;
-        }
+}
 
 static STACK_OF(ENGINE) *initialized_engines = NULL;
 
-static int int_engine_init(ENGINE *e)
-        {
+static int
+int_engine_init(ENGINE *e)
+{
         if (!ENGINE_init(e))
                 return 0;
         if (!initialized_engines)
                 initialized_engines = sk_ENGINE_new_null();
-        if (!initialized_engines || !sk_ENGINE_push(initialized_engines, e))
-                {
+        if (!initialized_engines || !sk_ENGINE_push(initialized_engines, e)) {
                 ENGINE_finish(e);
                 return 0;
-                }
-        return 1;
         }
-        
+        return 1;
+}
 
-static int int_engine_configure(char *name, char *value, const CONF *cnf)
-        {
+
+static int
+int_engine_configure(char *name, char *value, const CONF *cnf)
+{
         int i;
         int ret = 0;
         long do_init = -1;
@@ -107,19 +110,19 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
         /* Value is a section containing ENGINE commands */
         ecmds = NCONF_get_section(cnf, value);
 
-        if (!ecmds)
-                {
-                ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, ENGINE_R_ENGINE_SECTION_ERROR);
+        if (!ecmds) {
+                ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE,
+                    ENGINE_R_ENGINE_SECTION_ERROR);
                 return 0;
-                }
+        }
 
-        for (i = 0; i < sk_CONF_VALUE_num(ecmds); i++)
-                {
+        for (i = 0; i < sk_CONF_VALUE_num(ecmds); i++) {
                 ecmd = sk_CONF_VALUE_value(ecmds, i);
                 ctrlname = skip_dot(ecmd->name);
                 ctrlvalue = ecmd->value;
 #ifdef ENGINE_CONF_DEBUG
-        fprintf(stderr, "ENGINE conf: doing ctrl(%s,%s)\n", ctrlname, ctrlvalue);
+                fprintf(stderr, "ENGINE conf: doing ctrl(%s,%s)\n",
+                    ctrlname, ctrlvalue);
 #endif
 
                 /* First handle some special pseudo ctrls */
@@ -130,8 +133,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
                 else if (!strcmp(ctrlname, "soft_load"))
                         soft = 1;
                 /* Load a dynamic ENGINE */
-                else if (!strcmp(ctrlname, "dynamic_path"))
-                        {
+                else if (!strcmp(ctrlname, "dynamic_path")) {
                         e = ENGINE_by_id("dynamic");
                         if (!e)
                                 goto err;
@@ -141,119 +143,111 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
                                 goto err;
                         if (!ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0))
                                 goto err;
-                        }
+                }
                 /* ... add other pseudos here ... */
-                else
-                        {
+                else {
                         /* At this point we need an ENGINE structural reference
                          * if we don't already have one.
                          */
-                        if (!e)
-                                {
+                        if (!e) {
                                 e = ENGINE_by_id(name);
-                                if (!e && soft)
-                                        {
+                                if (!e && soft) {
                                         ERR_clear_error();
                                         return 1;
-                                        }
+                                }
                                 if (!e)
                                         goto err;
-                                }
+                        }
                         /* Allow "EMPTY" to mean no value: this allows a valid
                          * "value" to be passed to ctrls of type NO_INPUT
                          */
                         if (!strcmp(ctrlvalue, "EMPTY"))
                                 ctrlvalue = NULL;
-                        if (!strcmp(ctrlname, "init"))
-                                {
-                                if (!NCONF_get_number_e(cnf, value, "init", &do_init))
+                        if (!strcmp(ctrlname, "init")) {
+                                if (!NCONF_get_number_e(cnf, value, "init",
+                                    &do_init))
                                         goto err;
-                                if (do_init == 1)
-                                        {
+                                if (do_init == 1) {
                                         if (!int_engine_init(e))
                                                 goto err;
-                                        }
-                                else if (do_init != 0)
-                                        {
-                                        ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, ENGINE_R_INVALID_INIT_VALUE);
+                                } else if (do_init != 0) {
+                                        ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE,
+                                            ENGINE_R_INVALID_INIT_VALUE);
                                         goto err;
-                                        }
                                 }
-                        else if (!strcmp(ctrlname, "default_algorithms"))
-                                {
+                        }
+                        else if (!strcmp(ctrlname, "default_algorithms")) {
                                 if (!ENGINE_set_default_string(e, ctrlvalue))
                                         goto err;
-                                }
-                        else if (!ENGINE_ctrl_cmd_string(e,
-                                        ctrlname, ctrlvalue, 0))
+                        } else if (!ENGINE_ctrl_cmd_string(e,
+                                ctrlname, ctrlvalue, 0))
                                 goto err;
-                        }
-
-
-
                 }
-        if (e && (do_init == -1) && !int_engine_init(e))
-                {
+        }
+        if (e && (do_init == -1) && !int_engine_init(e)) {
                 ecmd = NULL;
                 goto err;
-                }
+        }
         ret = 1;
-        err:
-        if (ret != 1)
-                {
-                ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, ENGINE_R_ENGINE_CONFIGURATION_ERROR);
+
+err:
+        if (ret != 1) {
+                ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE,
+                    ENGINE_R_ENGINE_CONFIGURATION_ERROR);
                 if (ecmd)
                         ERR_asprintf_error_data
-                            ("section=%s, name=%s, value=%s",
+                        ("section=%s, name=%s, value=%s",
                             ecmd->section, ecmd->name, ecmd->value);
-                }
+        }
         if (e)
                 ENGINE_free(e);
         return ret;
-        }
+}
 
 
-static int int_engine_module_init(CONF_IMODULE *md, const CONF *cnf)
-        {
+static int
+int_engine_module_init(CONF_IMODULE *md, const CONF *cnf)
+{
         STACK_OF(CONF_VALUE) *elist;
         CONF_VALUE *cval;
         int i;
+
 #ifdef ENGINE_CONF_DEBUG
         fprintf(stderr, "Called engine module: name %s, value %s\n",
-                        CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+            CONF_imodule_get_name(md), CONF_imodule_get_value(md));
 #endif
         /* Value is a section containing ENGINEs to configure */
         elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
 
-        if (!elist)
-                {
-                ENGINEerr(ENGINE_F_INT_ENGINE_MODULE_INIT, ENGINE_R_ENGINES_SECTION_ERROR);
+        if (!elist) {
+                ENGINEerr(ENGINE_F_INT_ENGINE_MODULE_INIT,
+                    ENGINE_R_ENGINES_SECTION_ERROR);
                 return 0;
-                }
+        }
 
-        for (i = 0; i < sk_CONF_VALUE_num(elist); i++)
-                {
+        for (i = 0; i < sk_CONF_VALUE_num(elist); i++) {
                 cval = sk_CONF_VALUE_value(elist, i);
                 if (!int_engine_configure(cval->name, cval->value, cnf))
                         return 0;
-                }
+        }
 
         return 1;
-        }
+}
 
-static void int_engine_module_finish(CONF_IMODULE *md)
-        {
+static void
+int_engine_module_finish(CONF_IMODULE *md)
+{
         ENGINE *e;
+
         while ((e = sk_ENGINE_pop(initialized_engines)))
                 ENGINE_finish(e);
         sk_ENGINE_free(initialized_engines);
         initialized_engines = NULL;
-        }
-        
-
-void ENGINE_add_conf_module(void)
-        {
-        CONF_module_add("engines",
-                        int_engine_module_init,
-                        int_engine_module_finish);
-        }
+}
+
+void
+ENGINE_add_conf_module(void)
+{
+        CONF_module_add("engines", int_engine_module_init,
+            int_engine_module_finish);
+}