1 files changed, 41 insertions, 36 deletions

diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c
index e01067566e..f5ad01b80e 100644
--- a/src/lib/libcrypto/engine/eng_fat.c
+++ b/src/lib/libcrypto/engine/eng_fat.c
@@ -7,7 +7,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
@@ -54,55 +54,58 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
 #include "eng_int.h"
 #include <openssl/conf.h>
 
-int ENGINE_set_default(ENGINE *e, unsigned int flags)
-        {
-        if((flags & ENGINE_METHOD_CIPHERS) && !ENGINE_set_default_ciphers(e))
+int
+ENGINE_set_default(ENGINE *e, unsigned int flags)
+{
+        if ((flags & ENGINE_METHOD_CIPHERS) && !ENGINE_set_default_ciphers(e))
                 return 0;
-        if((flags & ENGINE_METHOD_DIGESTS) && !ENGINE_set_default_digests(e))
+        if ((flags & ENGINE_METHOD_DIGESTS) && !ENGINE_set_default_digests(e))
                 return 0;
 #ifndef OPENSSL_NO_RSA
-        if((flags & ENGINE_METHOD_RSA) && !ENGINE_set_default_RSA(e))
+        if ((flags & ENGINE_METHOD_RSA) && !ENGINE_set_default_RSA(e))
                 return 0;
 #endif
 #ifndef OPENSSL_NO_DSA
-        if((flags & ENGINE_METHOD_DSA) && !ENGINE_set_default_DSA(e))
+        if ((flags & ENGINE_METHOD_DSA) && !ENGINE_set_default_DSA(e))
                 return 0;
 #endif
 #ifndef OPENSSL_NO_DH
-        if((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e))
+        if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e))
                 return 0;
 #endif
 #ifndef OPENSSL_NO_ECDH
-        if((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e))
+        if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e))
                 return 0;
 #endif
 #ifndef OPENSSL_NO_ECDSA
-        if((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
+        if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
                 return 0;
 #endif
-        if((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
+        if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
                 return 0;
-        if((flags & ENGINE_METHOD_PKEY_METHS)
-                                && !ENGINE_set_default_pkey_meths(e))
+        if ((flags & ENGINE_METHOD_PKEY_METHS) &&
+            !ENGINE_set_default_pkey_meths(e))
                 return 0;
-        if((flags & ENGINE_METHOD_PKEY_ASN1_METHS)
-                                && !ENGINE_set_default_pkey_asn1_meths(e))
+        if ((flags & ENGINE_METHOD_PKEY_ASN1_METHS) &&
+            !ENGINE_set_default_pkey_asn1_meths(e))
                 return 0;
         return 1;
-        }
+}
 
 /* Set default algorithms using a string */
 
-static int int_def_cb(const char *alg, int len, void *arg)
-        {
+static int
+int_def_cb(const char *alg, int len, void *arg)
+{
         unsigned int *pflags = arg;
+
         if (!strncmp(alg, "ALL", len))
                 *pflags |= ENGINE_METHOD_ALL;
         else if (!strncmp(alg, "RSA", len))
@@ -123,7 +126,7 @@ static int int_def_cb(const char *alg, int len, void *arg)
                 *pflags |= ENGINE_METHOD_DIGESTS;
         else if (!strncmp(alg, "PKEY", len))
                 *pflags |=
-                        ENGINE_METHOD_PKEY_METHS|ENGINE_METHOD_PKEY_ASN1_METHS;
+                    ENGINE_METHOD_PKEY_METHS|ENGINE_METHOD_PKEY_ASN1_METHS;
         else if (!strncmp(alg, "PKEY_CRYPTO", len))
                 *pflags |= ENGINE_METHOD_PKEY_METHS;
         else if (!strncmp(alg, "PKEY_ASN1", len))
@@ -131,24 +134,25 @@ static int int_def_cb(const char *alg, int len, void *arg)
         else
                 return 0;
         return 1;
-        }
+}
 
-
-int ENGINE_set_default_string(ENGINE *e, const char *def_list)
-        {
+int
+ENGINE_set_default_string(ENGINE *e, const char *def_list)
+{
         unsigned int flags = 0;
-        if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags))
-                {
+
+        if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags)) {
                 ENGINEerr(ENGINE_F_ENGINE_SET_DEFAULT_STRING,
-                                        ENGINE_R_INVALID_STRING);
+                    ENGINE_R_INVALID_STRING);
                 ERR_asprintf_error_data("str=%s",def_list);
                 return 0;
-                }
-        return ENGINE_set_default(e, flags);
         }
+        return ENGINE_set_default(e, flags);
+}
 
-int ENGINE_register_complete(ENGINE *e)
-        {
+int
+ENGINE_register_complete(ENGINE *e)
+{
         ENGINE_register_ciphers(e);
         ENGINE_register_digests(e);
 #ifndef OPENSSL_NO_RSA
@@ -169,14 +173,15 @@ int ENGINE_register_complete(ENGINE *e)
         ENGINE_register_RAND(e);
         ENGINE_register_pkey_meths(e);
         return 1;
-        }
+}
 
-int ENGINE_register_all_complete(void)
-        {
+int
+ENGINE_register_all_complete(void)
+{
         ENGINE *e;
 
-        for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
+        for (e = ENGINE_get_first(); e; e = ENGINE_get_next(e))
                 if (!(e->flags & ENGINE_FLAGS_NO_REGISTER_ALL))
                         ENGINE_register_complete(e);
         return 1;
-        }
+}