1 files changed, 90 insertions, 74 deletions

diff --git a/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c
index 87d7aaa0dd..d42bcdb6ea 100644
--- a/src/lib/libcrypto/asn1/f_string.c
+++ b/src/lib/libcrypto/asn1/f_string.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -61,43 +61,50 @@
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>
 
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
+int
+i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
 {
-        int i,n=0;
-        static const char *h="0123456789ABCDEF";
+        int i, n = 0;
+        static const char *h = "0123456789ABCDEF";
         char buf[2];
 
-        if (a == NULL) return(0);
+        if (a == NULL)
+                return (0);
 
         if (a->length == 0) {
-                if (BIO_write(bp,"0",1) != 1) goto err;
-                n=1;
+                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;
+                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;
+                        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);
+        return (n);
+
 err:
-        return(-1);
+        return (-1);
 }
 
-int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
+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;
+        int ret = 0;
+        int i, j, k, m, n, again, bufsize;
+        unsigned char *s = NULL, *sp;
         unsigned char *bufp;
-        int num=0,slen=0,first=1;
+        int num = 0, slen = 0, first = 1;
 
-        bufsize=BIO_gets(bp,buf,size);
+        bufsize = BIO_gets(bp, buf, size);
         for (;;) {
                 if (bufsize < 1) {
                         if (first)
@@ -105,83 +112,92 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
                         else
                                 goto err_sl;
                 }
-                first=0;
+                first = 0;
 
-                i=bufsize;
-                if (buf[i-1] == '\n') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                if (buf[i-1] == '\r') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                again=(buf[i-1] == '\\');
+                i = bufsize;
+                if (buf[i-1] == '\n')
+                        buf[--i] = '\0';
+                if (i == 0)
+                        goto err_sl;
+                if (buf[i-1] == '\r')
+                        buf[--i] = '\0';
+                if (i == 0)
+                        goto err_sl;
+                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;
+                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';
+                buf[i] = '\0';
                 /* We have now cleared all the crap off the end of the
                  * line */
-                if (i < 2) goto err_sl;
+                if (i < 2)
+                        goto err_sl;
 
-                bufp=(unsigned char *)buf;
+                bufp = (unsigned char *)buf;
 
-                k=0;
-                i-=again;
-                if (i%2 != 0) {
-                        ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_ODD_NUMBER_OF_CHARS);
+                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) {
+                i /= 2;
+                if (num + i > slen) {
                         if (s == NULL)
-                                sp=(unsigned char *)malloc(
-                                        (unsigned int)num+i*2);
+                                sp = (unsigned char *)malloc(
+                                    (unsigned int)num + i * 2);
                         else
-                                sp=(unsigned char *)realloc(s,
-                                        (unsigned int)num+i*2);
+                                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);
+                                ASN1err(ASN1_F_A2I_ASN1_STRING,
+                                    ERR_R_MALLOC_FAILURE);
+                                if (s != NULL)
+                                        free(s);
                                 goto err;
                         }
-                        s=sp;
-                        slen=num+i*2;
+                        s = sp;
+                        slen = num + i * 2;
                 }
-                for (j=0; j<i; j++,k+=2) {
-                        for (n=0; n<2; n++) {
-                                m=bufp[k+n];
+                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';
+                                        m -= '0';
                                 else if ((m >= 'a') && (m <= 'f'))
-                                        m=m-'a'+10;
+                                        m = m - 'a' + 10;
                                 else if ((m >= 'A') && (m <= 'F'))
-                                        m=m-'A'+10;
+                                        m = m - 'A' + 10;
                                 else {
-                                        ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_NON_HEX_CHARACTERS);
+                                        ASN1err(ASN1_F_A2I_ASN1_STRING,
+                                            ASN1_R_NON_HEX_CHARACTERS);
                                         goto err;
                                 }
-                                s[num+j]<<=4;
-                                s[num+j]|=m;
+                                s[num + j] <<= 4;
+                                s[num + j] |= m;
                         }
                 }
-                num+=i;
+                num += i;
                 if (again)
-                        bufsize=BIO_gets(bp,buf,size);
+                        bufsize = BIO_gets(bp, buf, size);
                 else
                         break;
         }
-        bs->length=num;
-        bs->data=s;
-        ret=1;
+        bs->length = num;
+        bs->data = s;
+        ret = 1;
+
 err:
         if (0) {
 err_sl:
-                ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_SHORT_LINE);
+                ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_SHORT_LINE);
         }
-        return(ret);
+        return (ret);
 }
-