1 files changed, 29 insertions, 47 deletions

diff --git a/src/lib/libcrypto/x509/x509_obj.c b/src/lib/libcrypto/x509/x509_obj.c
index 5f38315f22..d0c02f833e 100644
--- a/src/lib/libcrypto/x509/x509_obj.c
+++ b/src/lib/libcrypto/x509/x509_obj.c
@@ -64,7 +64,7 @@
 #include <openssl/buffer.h>
 
 char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
-        {
+{
         X509_NAME_ENTRY *ne;
 int i;
         int n,lold,l,l1,l2,num,j,type;
@@ -76,103 +76,85 @@ int i;
         int gs_doit[4];
         char tmp_buf[80];
 
-        if (buf == NULL)
-                {
+        if (buf == NULL) {
                 if ((b=BUF_MEM_new()) == NULL) goto err;
                 if (!BUF_MEM_grow(b,200)) goto err;
                 b->data[0]='\0';
                 len=200;
+        }
+        if (a == NULL) {
+                if(b) {
+                        buf=b->data;
+                        free(b);
                 }
-        if (a == NULL)
-            {
-            if(b)
-                {
-                buf=b->data;
-                free(b);
-                }
-            strlcpy(buf,"NO X509_NAME",len);
-            return buf;
-            }
+                strlcpy(buf,"NO X509_NAME",len);
+                return buf;
+        }
 
         len--; /* space for '\0' */
         l=0;
-        for (i=0; i<sk_X509_NAME_ENTRY_num(a->entries); i++)
-                {
+        for (i=0; i<sk_X509_NAME_ENTRY_num(a->entries); i++) {
                 ne=sk_X509_NAME_ENTRY_value(a->entries,i);
                 n=OBJ_obj2nid(ne->object);
-                if ((n == NID_undef) || ((s=OBJ_nid2sn(n)) == NULL))
-                        {
+                if ((n == NID_undef) || ((s=OBJ_nid2sn(n)) == NULL)) {
                         i2t_ASN1_OBJECT(tmp_buf,sizeof(tmp_buf),ne->object);
                         s=tmp_buf;
-                        }
+                }
                 l1=strlen(s);
 
                 type=ne->value->type;
                 num=ne->value->length;
                 q=ne->value->data;
-                if ((type == V_ASN1_GENERALSTRING) && ((num%4) == 0))
-                        {
+                if ((type == V_ASN1_GENERALSTRING) && ((num%4) == 0)) {
                         gs_doit[0]=gs_doit[1]=gs_doit[2]=gs_doit[3]=0;
                         for (j=0; j<num; j++)
                                 if (q[j] != 0) gs_doit[j&3]=1;
 
                         if (gs_doit[0]|gs_doit[1]|gs_doit[2])
                                 gs_doit[0]=gs_doit[1]=gs_doit[2]=gs_doit[3]=1;
-                        else
-                                {
+                        else {
                                 gs_doit[0]=gs_doit[1]=gs_doit[2]=0;
                                 gs_doit[3]=1;
-                                }
                         }
-                else
+                } else
                         gs_doit[0]=gs_doit[1]=gs_doit[2]=gs_doit[3]=1;
 
-                for (l2=j=0; j<num; j++)
-                        {
+                for (l2=j=0; j<num; j++) {
                         if (!gs_doit[j&3]) continue;
                         l2++;
                         if ((q[j] < ' ') || (q[j] > '~')) l2+=3;
-                        }
+                }
 
                 lold=l;
                 l+=1+l1+1+l2;
-                if (b != NULL)
-                        {
+                if (b != NULL) {
                         if (!BUF_MEM_grow(b,l+1)) goto err;
                         p= &(b->data[lold]);
-                        }
-                else if (l > len)
-                        {
+                } else if (l > len) {
                         break;
-                        }
-                else
+                } else
                         p= &(buf[lold]);
                 *(p++)='/';
                 memcpy(p,s,(unsigned int)l1); p+=l1;
                 *(p++)='=';
                 q=ne->value->data;
-                for (j=0; j<num; j++)
-                        {
+                for (j=0; j<num; j++) {
                         if (!gs_doit[j&3]) continue;
                         n=q[j];
-                        if ((n < ' ') || (n > '~'))
-                                {
+                        if ((n < ' ') || (n > '~')) {
                                 *(p++)='\\';
                                 *(p++)='x';
                                 *(p++)=hex[(n>>4)&0x0f];
                                 *(p++)=hex[n&0x0f];
-                                }
-                        else
+                        } else
                                 *(p++)=n;
-                        }
-                *p='\0';
                 }
-        if (b != NULL)
-                {
+                *p='\0';
+        }
+        if (b != NULL) {
                 p=b->data;
                 free(b);
-                }
-        else
+        } else
                 p=buf;
         if (i == 0)
                 *p = '\0';
@@ -181,5 +163,5 @@ err:
         X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE);
         if (b != NULL) BUF_MEM_free(b);
         return(NULL);
-        }
+}