1 files changed, 38 insertions, 38 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_fre.c b/src/lib/libcrypto/asn1/tasn_fre.c
index b04034ba4c..b321de6615 100644
--- a/src/lib/libcrypto/asn1/tasn_fre.c
+++ b/src/lib/libcrypto/asn1/tasn_fre.c
@@ -67,17 +67,17 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
 /* Free up an ASN1 structure */
 
 void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it)
-        {
+{
         asn1_item_combine_free(&val, it, 0);
-        }
+}
 
 void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
-        {
+{
         asn1_item_combine_free(pval, it, 0);
-        }
+}
 
 static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)
-        {
+{
         const ASN1_TEMPLATE *tt = NULL, *seqtt;
         const ASN1_EXTERN_FUNCS *ef;
         const ASN1_COMPAT_FUNCS *cf;
@@ -94,7 +94,7 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
                 asn1_cb = 0;
 
         switch(it->itype)
-                {
+        {
 
                 case ASN1_ITYPE_PRIMITIVE:
                 if (it->templates)
@@ -109,26 +109,26 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
 
                 case ASN1_ITYPE_CHOICE:
                 if (asn1_cb)
-                        {
+                {
                         i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
                         if (i == 2)
                                 return;
-                        }
+                }
                 i = asn1_get_choice_selector(pval, it);
                 if ((i >= 0) && (i < it->tcount))
-                        {
+                {
                         ASN1_VALUE **pchval;
                         tt = it->templates + i;
                         pchval = asn1_get_field_ptr(pval, tt);
                         ASN1_template_free(pchval, tt);
-                        }
+                }
                 if (asn1_cb)
                         asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
                 if (!combine)
-                        {
+                {
                         free(*pval);
                         *pval = NULL;
-                        }
+                }
                 break;
 
                 case ASN1_ITYPE_COMPAT:
@@ -148,11 +148,11 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
                 if (asn1_do_lock(pval, -1, it) > 0)
                         return;
                 if (asn1_cb)
-                        {
+                {
                         i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
                         if (i == 2)
                                 return;
-                        }               
+                }               
                 asn1_enc_free(pval, it);
                 /* If we free up as normal we will invalidate any
                  * ANY DEFINED BY field and we wont be able to 
@@ -161,83 +161,83 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int c
                  */
                 tt = it->templates + it->tcount - 1;
                 for (i = 0; i < it->tcount; tt--, i++)
-                        {
+                {
                         ASN1_VALUE **pseqval;
                         seqtt = asn1_do_adb(pval, tt, 0);
                         if (!seqtt)
                                 continue;
                         pseqval = asn1_get_field_ptr(pval, seqtt);
                         ASN1_template_free(pseqval, seqtt);
-                        }
+                }
                 if (asn1_cb)
                         asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
                 if (!combine)
-                        {
+                {
                         free(*pval);
                         *pval = NULL;
-                        }
-                break;
                 }
+                break;
         }
+}
 
 void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
-        {
+{
         int i;
         if (tt->flags & ASN1_TFLG_SK_MASK)
-                {
+        {
                 STACK_OF(ASN1_VALUE) *sk = (STACK_OF(ASN1_VALUE) *)*pval;
                 for (i = 0; i < sk_ASN1_VALUE_num(sk); i++)
-                        {
+                {
                         ASN1_VALUE *vtmp;
                         vtmp = sk_ASN1_VALUE_value(sk, i);
                         asn1_item_combine_free(&vtmp, ASN1_ITEM_ptr(tt->item),
                                                                         0);
-                        }
+                }
                 sk_ASN1_VALUE_free(sk);
                 *pval = NULL;
-                }
+        }
         else
                 asn1_item_combine_free(pval, ASN1_ITEM_ptr(tt->item),
                                                 tt->flags & ASN1_TFLG_COMBINE);
-        }
+}
 
 void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
-        {
+{
         int utype;
         if (it)
-                {
+        {
                 const ASN1_PRIMITIVE_FUNCS *pf;
                 pf = it->funcs;
                 if (pf && pf->prim_free)
-                        {
+                {
                         pf->prim_free(pval, it);
                         return;
-                        }
                 }
+        }
         /* Special case: if 'it' is NULL free contents of ASN1_TYPE */
         if (!it)
-                {
+        {
                 ASN1_TYPE *typ = (ASN1_TYPE *)*pval;
                 utype = typ->type;
                 pval = &typ->value.asn1_value;
                 if (!*pval)
                         return;
-                }
+        }
         else if (it->itype == ASN1_ITYPE_MSTRING)
-                {
+        {
                 utype = -1;
                 if (!*pval)
                         return;
-                }
+        }
         else
-                {
+        {
                 utype = it->utype;
                 if ((utype != V_ASN1_BOOLEAN) && !*pval)
                         return;
-                }
+        }
 
         switch(utype)
-                {
+        {
                 case V_ASN1_OBJECT:
                 ASN1_OBJECT_free((ASN1_OBJECT *)*pval);
                 break;
@@ -261,6 +261,6 @@ void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
                 ASN1_STRING_free((ASN1_STRING *)*pval);
                 *pval = NULL;
                 break;
-                }
-        *pval = NULL;
         }
+        *pval = NULL;
+}