1 files changed, 53 insertions, 70 deletions

diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index 27bc4dc9a3..729fb060f8 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -65,17 +65,17 @@
 #include <openssl/x509.h>
 
 int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
-        {
+{
         ASN1_OBJECT *obj;
 
         obj=OBJ_nid2obj(nid);
         if (obj == NULL) return(-1);
         return(X509_NAME_get_text_by_OBJ(name,obj,buf,len));
-        }
+}
 
 int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,
              int len)
-        {
+{
         int i;
         ASN1_STRING *data;
 
@@ -87,27 +87,27 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,
         memcpy(buf,data->data,i);
         buf[i]='\0';
         return(i);
-        }
+}
 
 int X509_NAME_entry_count(X509_NAME *name)
-        {
+{
         if (name == NULL) return(0);
         return(sk_X509_NAME_ENTRY_num(name->entries));
-        }
+}
 
 int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
-        {
+{
         ASN1_OBJECT *obj;
 
         obj=OBJ_nid2obj(nid);
         if (obj == NULL) return(-2);
         return(X509_NAME_get_index_by_OBJ(name,obj,lastpos));
-        }
+}
 
 /* NOTE: you should be passsing -1, not 0 as lastpos */
 int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
              int lastpos)
-        {
+{
         int n;
         X509_NAME_ENTRY *ne;
         STACK_OF(X509_NAME_ENTRY) *sk;
@@ -117,26 +117,25 @@ int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
                 lastpos= -1;
         sk=name->entries;
         n=sk_X509_NAME_ENTRY_num(sk);
-        for (lastpos++; lastpos < n; lastpos++)
-                {
+        for (lastpos++; lastpos < n; lastpos++) {
                 ne=sk_X509_NAME_ENTRY_value(sk,lastpos);
                 if (OBJ_cmp(ne->object,obj) == 0)
                         return(lastpos);
-                }
-        return(-1);
         }
+        return(-1);
+}
 
 X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc)
-        {
+{
         if(name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
            || loc < 0)
                 return(NULL);
         else
                 return(sk_X509_NAME_ENTRY_value(name->entries,loc));
-        }
+}
 
 X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
-        {
+{
         X509_NAME_ENTRY *ret;
         int i,n,set_prev,set_next;
         STACK_OF(X509_NAME_ENTRY) *sk;
@@ -169,7 +168,7 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
                 for (i=loc; i<n; i++)
                         sk_X509_NAME_ENTRY_value(sk,i)->set--;
         return(ret);
-        }
+}
 
 int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
                         unsigned char *bytes, int len, int loc, int set)
@@ -211,7 +210,7 @@ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
  * prepend to the guy we are about to stomp on. */
 int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
              int set)
-        {
+{
         X509_NAME_ENTRY *new_name=NULL;
         int n,i,inc;
         STACK_OF(X509_NAME_ENTRY) *sk;
@@ -224,101 +223,87 @@ int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
 
         name->modified=1;
 
-        if (set == -1)
-                {
-                if (loc == 0)
-                        {
+        if (set == -1) {
+                if (loc == 0) {
                         set=0;
                         inc=1;
-                        }
-                else
-                        {
+                } else {
                         set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set;
                         inc=0;
-                        }
                 }
-        else /* if (set >= 0) */
-                {
-                if (loc >= n)
-                        {
+        } else /* if (set >= 0) */ {
+                if (loc >= n) {
                         if (loc != 0)
                                 set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set+1;
                         else
                                 set=0;
-                        }
-                else
+                } else
                         set=sk_X509_NAME_ENTRY_value(sk,loc)->set;
                 inc=(set == 0)?1:0;
-                }
+        }
 
         if ((new_name=X509_NAME_ENTRY_dup(ne)) == NULL)
                 goto err;
         new_name->set=set;
-        if (!sk_X509_NAME_ENTRY_insert(sk,new_name,loc))
-                {
+        if (!sk_X509_NAME_ENTRY_insert(sk,new_name,loc)) {
                 X509err(X509_F_X509_NAME_ADD_ENTRY,ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
-        if (inc)
-                {
+        }
+        if (inc) {
                 n=sk_X509_NAME_ENTRY_num(sk);
                 for (i=loc+1; i<n; i++)
                         sk_X509_NAME_ENTRY_value(sk,i-1)->set+=1;
-                }       
+        }       
         return(1);
 err:
         if (new_name != NULL)
                 X509_NAME_ENTRY_free(new_name);
         return(0);
-        }
+}
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
                 const char *field, int type, const unsigned char *bytes, int len)
-        {
+{
         ASN1_OBJECT *obj;
         X509_NAME_ENTRY *nentry;
 
         obj=OBJ_txt2obj(field, 0);
-        if (obj == NULL)
-                {
+        if (obj == NULL) {
                 X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,
                                                 X509_R_INVALID_FIELD_NAME);
                 ERR_add_error_data(2, "name=", field);
                 return(NULL);
-                }
+        }
         nentry = X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len);
         ASN1_OBJECT_free(obj);
         return nentry;
-        }
+}
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
              int type, unsigned char *bytes, int len)
-        {
+{
         ASN1_OBJECT *obj;
         X509_NAME_ENTRY *nentry;
 
         obj=OBJ_nid2obj(nid);
-        if (obj == NULL)
-                {
+        if (obj == NULL) {
                 X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID,X509_R_UNKNOWN_NID);
                 return(NULL);
-                }
+        }
         nentry = X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len);
         ASN1_OBJECT_free(obj);
         return nentry;
-        }
+}
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
              ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len)
-        {
+{
         X509_NAME_ENTRY *ret;
 
-        if ((ne == NULL) || (*ne == NULL))
-                {
+        if ((ne == NULL) || (*ne == NULL)) {
                 if ((ret=X509_NAME_ENTRY_new()) == NULL)
                         return(NULL);
-                }
-        else
+        } else
                 ret= *ne;
 
         if (!X509_NAME_ENTRY_set_object(ret,obj))
@@ -332,23 +317,22 @@ err:
         if ((ne == NULL) || (ret != *ne))
                 X509_NAME_ENTRY_free(ret);
         return(NULL);
-        }
+}
 
 int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj)
-        {
-        if ((ne == NULL) || (obj == NULL))
-                {
+{
+        if ((ne == NULL) || (obj == NULL)) {
                 X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,ERR_R_PASSED_NULL_PARAMETER);
                 return(0);
-                }
+        }
         ASN1_OBJECT_free(ne->object);
         ne->object=OBJ_dup(obj);
         return((ne->object == NULL)?0:1);
-        }
+}
 
 int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
              const unsigned char *bytes, int len)
-        {
+{
         int i;
 
         if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0);
@@ -359,25 +343,24 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
         if (len < 0) len=strlen((const char *)bytes);
         i=ASN1_STRING_set(ne->value,bytes,len);
         if (!i) return(0);
-        if (type != V_ASN1_UNDEF)
-                {
+        if (type != V_ASN1_UNDEF) {
                 if (type == V_ASN1_APP_CHOOSE)
                         ne->value->type=ASN1_PRINTABLE_type(bytes,len);
                 else
                         ne->value->type=type;
-                }
-        return(1);
         }
+        return(1);
+}
 
 ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne)
-        {
+{
         if (ne == NULL) return(NULL);
         return(ne->object);
-        }
+}
 
 ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne)
-        {
+{
         if (ne == NULL) return(NULL);
         return(ne->value);
-        }
+}