1 files changed, 62 insertions, 73 deletions

diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index 5e3eba4029..7f0824f75e 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -68,7 +68,7 @@
 /* X509_VERIFY_PARAM functions */
 
 static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
-        {
+{
         if (!param)
                 return;
         param->name = NULL;
@@ -78,27 +78,26 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
         param->inh_flags = 0;
         param->flags = 0;
         param->depth = -1;
-        if (param->policies)
-                {
+        if (param->policies) {
                 sk_ASN1_OBJECT_pop_free(param->policies, ASN1_OBJECT_free);
                 param->policies = NULL;
-                }
         }
+}
 
 X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void)
-        {
+{
         X509_VERIFY_PARAM *param;
         param = malloc(sizeof(X509_VERIFY_PARAM));
         memset(param, 0, sizeof(X509_VERIFY_PARAM));
         x509_verify_param_zero(param);
         return param;
-        }
+}
 
 void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param)
-        {
+{
         x509_verify_param_zero(param);
         free(param);
-        }
+}
 
 /* This function determines how parameters are "inherited" from one structure
  * to another. There are several different ways this can happen.
@@ -146,7 +145,7 @@ void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param)
 
 int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
                                                 const X509_VERIFY_PARAM *src)
-        {
+{
         unsigned long inh_flags;
         int to_default, to_overwrite;
         if (!src)
@@ -175,104 +174,101 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
 
         /* If overwrite or check time not set, copy across */
 
-        if (to_overwrite || !(dest->flags & X509_V_FLAG_USE_CHECK_TIME))
-                {
+        if (to_overwrite || !(dest->flags & X509_V_FLAG_USE_CHECK_TIME)) {
                 dest->check_time = src->check_time;
                 dest->flags &= ~X509_V_FLAG_USE_CHECK_TIME;
                 /* Don't need to copy flag: that is done below */
-                }
+        }
 
         if (inh_flags & X509_VP_FLAG_RESET_FLAGS)
                 dest->flags = 0;
 
         dest->flags |= src->flags;
 
-        if (test_x509_verify_param_copy(policies, NULL))
-                {
+        if (test_x509_verify_param_copy(policies, NULL)) {
                 if (!X509_VERIFY_PARAM_set1_policies(dest, src->policies))
                         return 0;
-                }
+        }
 
         return 1;
-        }
+}
 
 int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
                                                 const X509_VERIFY_PARAM *from)
-        {
+{
         unsigned long save_flags = to->inh_flags;
         int ret;
         to->inh_flags |= X509_VP_FLAG_DEFAULT;
         ret = X509_VERIFY_PARAM_inherit(to, from);
         to->inh_flags = save_flags;
         return ret;
-        }
+}
 
 int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name)
-        {
+{
         if (param->name)
                 free(param->name);
         param->name = BUF_strdup(name);
         if (param->name)
                 return 1;
         return 0;
-        }
+}
 
 int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags)
-        {
+{
         param->flags |= flags;
         if (flags & X509_V_FLAG_POLICY_MASK)
                 param->flags |= X509_V_FLAG_POLICY_CHECK;
         return 1;
-        }
+}
 
 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags)
-        {
+{
         param->flags &= ~flags;
         return 1;
-        }
+}
 
 unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param)
-        {
+{
         return param->flags;
-        }
+}
 
 int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose)
-        {
+{
         return X509_PURPOSE_set(&param->purpose, purpose);
-        }
+}
 
 int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust)
-        {
+{
         return X509_TRUST_set(&param->trust, trust);
-        }
+}
 
 void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth)
-        {
+{
         param->depth = depth;
-        }
+}
 
 void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t)
-        {
+{
         param->check_time = t;
         param->flags |= X509_V_FLAG_USE_CHECK_TIME;
-        }
+}
 
 int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, ASN1_OBJECT *policy)
-        {
-        if (!param->policies)
-                {
+{
+        if (!param->policies) {
                 param->policies = sk_ASN1_OBJECT_new_null();
                 if (!param->policies)
                         return 0;
-                }
+        }
         if (!sk_ASN1_OBJECT_push(param->policies, policy))
                 return 0;
         return 1;
-        }
+}
 
 int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, 
                                         STACK_OF(ASN1_OBJECT) *policies)
-        {
+{
         int i;
         ASN1_OBJECT *oid, *doid;
         if (!param)
@@ -280,36 +276,33 @@ int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
         if (param->policies)
                 sk_ASN1_OBJECT_pop_free(param->policies, ASN1_OBJECT_free);
 
-        if (!policies)
-                {
+        if (!policies) {
                 param->policies = NULL;
                 return 1;
-                }
+        }
 
         param->policies = sk_ASN1_OBJECT_new_null();
         if (!param->policies)
                 return 0;
 
-        for (i = 0; i < sk_ASN1_OBJECT_num(policies); i++)
-                {
+        for (i = 0; i < sk_ASN1_OBJECT_num(policies); i++) {
                 oid = sk_ASN1_OBJECT_value(policies, i);
                 doid = OBJ_dup(oid);
                 if (!doid)
                         return 0;
-                if (!sk_ASN1_OBJECT_push(param->policies, doid))
-                        {
+                if (!sk_ASN1_OBJECT_push(param->policies, doid)) {
                         ASN1_OBJECT_free(doid);
                         return 0;
-                        }
                 }
+        }
         param->flags |= X509_V_FLAG_POLICY_CHECK;
         return 1;
-        }
+}
 
 int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param)
-        {
+{
         return param->depth;
-        }
+}
 
 /* Default verify parameters: these are used for various
  * applications and can be overridden by the user specified table.
@@ -367,15 +360,16 @@ static const X509_VERIFY_PARAM default_table[] = {
         X509_TRUST_SSL_SERVER,          /* trust */
         -1,                             /* depth */
         NULL                            /* policies */
-        }};
+        }
+};
 
 static STACK_OF(X509_VERIFY_PARAM) *param_table = NULL;
 
 static int table_cmp(const X509_VERIFY_PARAM *a, const X509_VERIFY_PARAM *b)
 
-        {
+{
         return strcmp(a->name, b->name);
-        }
+}
 
 DECLARE_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM,
                            table);
@@ -384,55 +378,50 @@ IMPLEMENT_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM,
 
 static int param_cmp(const X509_VERIFY_PARAM * const *a,
                         const X509_VERIFY_PARAM * const *b)
-        {
+{
         return strcmp((*a)->name, (*b)->name);
-        }
+}
 
 int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param)
-        {
+{
         int idx;
         X509_VERIFY_PARAM *ptmp;
-        if (!param_table)
-                {
+        if (!param_table) {
                 param_table = sk_X509_VERIFY_PARAM_new(param_cmp);
                 if (!param_table)
                         return 0;
-                }
-        else
-                {
+        } else {
                 idx = sk_X509_VERIFY_PARAM_find(param_table, param);
-                if (idx != -1)
-                        {
+                if (idx != -1) {
                         ptmp = sk_X509_VERIFY_PARAM_value(param_table, idx);
                         X509_VERIFY_PARAM_free(ptmp);
                         (void)sk_X509_VERIFY_PARAM_delete(param_table, idx);
-                        }
                 }
+        }
         if (!sk_X509_VERIFY_PARAM_push(param_table, param))
                 return 0;
         return 1;
-        }
+}
 
 const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name)
-        {
+{
         int idx;
         X509_VERIFY_PARAM pm;
 
         pm.name = (char *)name;
-        if (param_table)
-                {
+        if (param_table) {
                 idx = sk_X509_VERIFY_PARAM_find(param_table, &pm);
                 if (idx != -1)
                         return sk_X509_VERIFY_PARAM_value(param_table, idx);
-                }
+        }
         return OBJ_bsearch_table(&pm, default_table,
                            sizeof(default_table)/sizeof(X509_VERIFY_PARAM));
-        }
+}
 
 void X509_VERIFY_PARAM_table_cleanup(void)
-        {
+{
         if (param_table)
                 sk_X509_VERIFY_PARAM_pop_free(param_table,
                                                 X509_VERIFY_PARAM_free);
         param_table = NULL;
-        }
+}