putting most of the braces in the right column is the very least we can do.

1 files changed, 31 insertions, 31 deletions

diff --git a/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c
index f4bee15335..7a59fa9f4f 100644
--- a/src/lib/libcrypto/asn1/f_string.c
+++ b/src/lib/libcrypto/asn1/f_string.c
@@ -62,7 +62,7 @@
 #include <openssl/asn1.h>
 
 int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
-        {
+{
         int i,n=0;
         static const char *h="0123456789ABCDEF";
         char buf[2];
@@ -70,32 +70,32 @@ int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
         if (a == NULL) return(0);
 
         if (a->length == 0)
-                {
+        {
                 if (BIO_write(bp,"0",1) != 1) goto err;
                 n=1;
-                }
+        }
         else
-                {
+        {
                 for (i=0; i<a->length; i++)
-                        {
+                {
                         if ((i != 0) && (i%35 == 0))
-                                {
+                        {
                                 if (BIO_write(bp,"\\\n",2) != 2) goto err;
                                 n+=2;
-                                }
+                        }
                         buf[0]=h[((unsigned char)a->data[i]>>4)&0x0f];
                         buf[1]=h[((unsigned char)a->data[i]   )&0x0f];
                         if (BIO_write(bp,buf,2) != 2) goto err;
                         n+=2;
-                        }
                 }
+        }
         return(n);
 err:
         return(-1);
-        }
+}
 
 int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
-        {
+{
         int ret=0;
         int i,j,k,m,n,again,bufsize;
         unsigned char *s=NULL,*sp;
@@ -104,14 +104,14 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
 
         bufsize=BIO_gets(bp,buf,size);
         for (;;)
-                {
+        {
                 if (bufsize < 1)
-                        {
+                {
                         if (first)
                                 break;
                         else
                                 goto err_sl;
-                        }
+                }
                 first=0;
 
                 i=bufsize;
@@ -122,15 +122,15 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
                 again=(buf[i-1] == '\\');
 
                 for (j=i-1; j>0; j--)
-                        {
+                {
                         if (!(  ((buf[j] >= '0') && (buf[j] <= '9')) ||
                                 ((buf[j] >= 'a') && (buf[j] <= 'f')) ||
                                 ((buf[j] >= 'A') && (buf[j] <= 'F'))))
-                                {
+                        {
                                 i=j;
                                 break;
-                                }
                         }
+                }
                 buf[i]='\0';
                 /* We have now cleared all the crap off the end of the
                  * line */
@@ -141,13 +141,13 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
                 k=0;
                 i-=again;
                 if (i%2 != 0)
-                        {
+                {
                         ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_ODD_NUMBER_OF_CHARS);
                         goto err;
-                        }
+                }
                 i/=2;
                 if (num+i > slen)
-                        {
+                {
                         if (s == NULL)
                                 sp=(unsigned char *)malloc(
                                         (unsigned int)num+i*2);
@@ -155,18 +155,18 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
                                 sp=(unsigned char *)realloc(s,
                                         (unsigned int)num+i*2);
                         if (sp == NULL)
-                                {
+                        {
                                 ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE);
                                 if (s != NULL) free(s);
                                 goto err;
-                                }
+                        }
                         s=sp;
                         slen=num+i*2;
-                        }
+                }
                 for (j=0; j<i; j++,k+=2)
-                        {
+                {
                         for (n=0; n<2; n++)
-                                {
+                        {
                                 m=bufp[k+n];
                                 if ((m >= '0') && (m <= '9'))
                                         m-='0';
@@ -175,29 +175,29 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
                                 else if ((m >= 'A') && (m <= 'F'))
                                         m=m-'A'+10;
                                 else
-                                        {
+                                {
                                         ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_NON_HEX_CHARACTERS);
                                         goto err;
-                                        }
+                                }
                                 s[num+j]<<=4;
                                 s[num+j]|=m;
-                                }
                         }
+                }
                 num+=i;
                 if (again)
                         bufsize=BIO_gets(bp,buf,size);
                 else
                         break;
-                }
+        }
         bs->length=num;
         bs->data=s;
         ret=1;
 err:
         if (0)
-                {
+        {
 err_sl:
                 ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_SHORT_LINE);
-                }
-        return(ret);
         }
+        return(ret);
+}