1 files changed, 48 insertions, 43 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_genn.c b/src/lib/libcrypto/x509v3/v3_genn.c
index b628357301..b47098e5a7 100644
--- a/src/lib/libcrypto/x509v3/v3_genn.c
+++ b/src/lib/libcrypto/x509v3/v3_genn.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
@@ -94,27 +94,28 @@ ASN1_CHOICE(GENERAL_NAME) = {
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAME)
 
-ASN1_ITEM_TEMPLATE(GENERAL_NAMES) = 
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
+ASN1_ITEM_TEMPLATE(GENERAL_NAMES) =
+    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
 ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
 
-GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a)
-        {
-        return (GENERAL_NAME *) ASN1_dup((i2d_of_void *) i2d_GENERAL_NAME,
-                                         (d2i_of_void *) d2i_GENERAL_NAME,
-                                         (char *) a);
-        }
+GENERAL_NAME *
+GENERAL_NAME_dup(GENERAL_NAME *a)
+{
+        return (GENERAL_NAME *)ASN1_dup((i2d_of_void *)i2d_GENERAL_NAME,
+            (d2i_of_void *)d2i_GENERAL_NAME, (char *)a);
+}
 
 /* Returns 0 if they are equal, != 0 otherwise. */
-int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b)
-        {
+int
+GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b)
+{
         int result = -1;
 
-        if (!a || !b || a->type != b->type) return -1;
-        switch(a->type)
-                {
+        if (!a || !b || a->type != b->type)
+                return -1;
+        switch (a->type) {
         case GEN_X400:
         case GEN_EDIPARTY:
                 result = ASN1_TYPE_cmp(a->d.other, b->d.other);
@@ -137,32 +138,34 @@ int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b)
         case GEN_IPADD:
                 result = ASN1_OCTET_STRING_cmp(a->d.ip, b->d.ip);
                 break;
-        
+
         case GEN_RID:
                 result = OBJ_cmp(a->d.rid, b->d.rid);
                 break;
-                }
-        return result;
         }
+        return result;
+}
 
 /* Returns 0 if they are equal, != 0 otherwise. */
-int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b)
-        {
+int
+OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b)
+{
         int result = -1;
 
-        if (!a || !b) return -1;
+        if (!a || !b)
+                return -1;
         /* Check their type first. */
         if ((result = OBJ_cmp(a->type_id, b->type_id)) != 0)
                 return result;
         /* Check the value. */
         result = ASN1_TYPE_cmp(a->value, b->value);
         return result;
-        }
+}
 
-void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value)
-        {
-        switch(type)
-                {
+void
+GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value)
+{
+        switch (type) {
         case GEN_X400:
         case GEN_EDIPARTY:
                 a->d.other = value;
@@ -185,20 +188,20 @@ void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value)
         case GEN_IPADD:
                 a->d.ip = value;
                 break;
-        
+
         case GEN_RID:
                 a->d.rid = value;
                 break;
-                }
-        a->type = type;
         }
+        a->type = type;
+}
 
-void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype)
-        {
+void *
+GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype)
+{
         if (ptype)
                 *ptype = a->type;
-        switch(a->type)
-                {
+        switch (a->type) {
         case GEN_X400:
         case GEN_EDIPARTY:
                 return a->d.other;
@@ -216,19 +219,21 @@ void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype)
 
         case GEN_IPADD:
                 return a->d.ip;
-        
+
         case GEN_RID:
                 return a->d.rid;
 
         default:
                 return NULL;
-                }
         }
+}
 
-int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-                                ASN1_OBJECT *oid, ASN1_TYPE *value)
-        {
+int
+GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid,
+    ASN1_TYPE *value)
+{
         OTHERNAME *oth;
+
         oth = OTHERNAME_new();
         if (!oth)
                 return 0;
@@ -236,11 +241,12 @@ int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
         oth->value = value;
         GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth);
         return 1;
-        }
+}
 
-int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, 
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
-        {
+int
+GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid,
+    ASN1_TYPE **pvalue)
+{
         if (gen->type != GEN_OTHERNAME)
                 return 0;
         if (poid)
@@ -248,5 +254,4 @@ int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen,
         if (pvalue)
                 *pvalue = gen->d.otherName->value;
         return 1;
-        }
-
+}