8 files changed, 1010 insertions, 1016 deletions
diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index e2b65bf2ac..5633cfca1c 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.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
@@ -60,82 +60,91 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
-int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
+int
-{ return M_ASN1_BIT_STRING_set(x, d, len); }
+ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
+{
+        return M_ASN1_BIT_STRING_set(x, d, len);
+}
-int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
+int
-        {
+i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
-        int ret,j,bits,len;
+{
-        unsigned char *p,*d;
+        int ret, j,bits, len;
+        unsigned char *p, *d;
-        if (a == NULL) return(0);
+        if (a == NULL)
+                return (0);
-        len=a->length;
+        len = a->length;
-        if (len > 0)
+        if (len > 0) {
-                {
+                if (a->flags & ASN1_STRING_FLAG_BITS_LEFT) {
-                if (a->flags & ASN1_STRING_FLAG_BITS_LEFT)
+                        bits = (int)a->flags & 0x07;
-                        {
+                } else {
-                        bits=(int)a->flags&0x07;
+                        for (; len > 0; len--) {
-                        }
+                                if (a->data[len - 1])
-                else
+                                        break;
-                        {
-                        for ( ; len > 0; len--)
-                                {
-                                if (a->data[len-1]) break;
-                                }
-                        j=a->data[len-1];
-                        if      (j & 0x01) bits=0;
-                        else if (j & 0x02) bits=1;
-                        else if (j & 0x04) bits=2;
-                        else if (j & 0x08) bits=3;
-                        else if (j & 0x10) bits=4;
-                        else if (j & 0x20) bits=5;
-                        else if (j & 0x40) bits=6;
-                        else if (j & 0x80) bits=7;
-                        else bits=0; /* should not happen */
                        }
+                        j = a->data[len - 1];
+                        if (j & 0x01)
+                                bits = 0;
+                        else if (j & 0x02)
+                                bits = 1;
+                        else if (j & 0x04)
+                                bits = 2;
+                        else if (j & 0x08)
+                                bits = 3;
+                        else if (j & 0x10)
+                                bits = 4;
+                        else if (j & 0x20)
+                                bits = 5;
+                        else if (j & 0x40)
+                                bits = 6;
+                        else if (j & 0x80)
+                                bits = 7;
+                        else
+                                bits = 0; /* should not happen */
                }
-        else
+        } else
-                bits=0;
+                bits = 0;
-        ret=1+len;
+        ret = 1 + len;
-        if (pp == NULL) return(ret);
+        if (pp == NULL)
+                return (ret);
        p= *pp;
-        *(p++)=(unsigned char)bits;
+        *(p++) = (unsigned char)bits;
-        d=a->data;
+        d = a->data;
-        memcpy(p,d,len);
+        memcpy(p, d, len);
-        p+=len;
+        p += len;
-        if (len > 0) p[-1]&=(0xff<<bits);
+        if (len > 0)
-        *pp=p;
+                p[-1]&=(0xff << bits);
-        return(ret);
+        *pp = p;
-        }
+        return (ret);
+}
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
+ASN1_BIT_STRING *
-        const unsigned char **pp, long len)
+c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
-        {
+{
-        ASN1_BIT_STRING *ret=NULL;
+        ASN1_BIT_STRING *ret = NULL;
        const unsigned char *p;
        unsigned char *s;
        int i;
-        if (len < 1)
+        if (len < 1) {
-                {
+                i = ASN1_R_STRING_TOO_SHORT;
-                i=ASN1_R_STRING_TOO_SHORT;
                goto err;
-                }
+        }
-        if ((a == NULL) || ((*a) == NULL))
+        if ((a == NULL) || ((*a) == NULL)) {
-                {
+                if ((ret = M_ASN1_BIT_STRING_new()) == NULL)
-                if ((ret=M_ASN1_BIT_STRING_new()) == NULL) return(NULL);
+                        return (NULL);
-                }
+        } else
-        else
+                ret = (*a);
-                ret=(*a);
-        p= *pp;
+        p = *pp;
-        i= *(p++);
+        i = *(p++);
        /* We do this to preserve the settings.  If we modify
         * the settings, via the _set_bit function, we will recalculate
         * on output */
@@ -143,106 +152,111 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
        ret->flags|=(ASN1_STRING_FLAG_BITS_LEFT|(i&0x07)); /* set */
        if (len-- > 1) /* using one because of the bits left byte */
-                {
+        {
-                s=(unsigned char *)malloc((int)len);
+                s = (unsigned char *)malloc((int)len);
-                if (s == NULL)
+                if (s == NULL) {
-                        {
+                        i = ERR_R_MALLOC_FAILURE;
-                        i=ERR_R_MALLOC_FAILURE;
                        goto err;
-                        }
-                memcpy(s,p,(int)len);
-                s[len-1]&=(0xff<<i);
-                p+=len;
                }
-        else
+                memcpy(s, p, (int)len);
-                s=NULL;
+                s[len - 1] &= (0xff << i);
+                p += len;
-        ret->length=(int)len;
+        } else
-        if (ret->data != NULL) free(ret->data);
+                s = NULL;
-        ret->data=s;
-        ret->type=V_ASN1_BIT_STRING;
+        ret->length = (int)len;
-        if (a != NULL) (*a)=ret;
+        if (ret->data != NULL)
-        *pp=p;
+                free(ret->data);
-        return(ret);
+        ret->data = s;
+        ret->type = V_ASN1_BIT_STRING;
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
 err:
-        ASN1err(ASN1_F_C2I_ASN1_BIT_STRING,i);
+        ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                M_ASN1_BIT_STRING_free(ret);
-        return(NULL);
+        return (NULL);
-        }
+}
 /* These next 2 functions from Goetz Babin-Ebell <babinebell@trustcenter.de>
 */
-int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
+int
-        {
+ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
-        int w,v,iv;
+{
+        int w, v, iv;
        unsigned char *c;
-        w=n/8;
+        w = n/8;
-        v=1<<(7-(n&0x07));
+        v = 1 << (7 - (n & 0x07));
-        iv= ~v;
+        iv = ~v;
-        if (!value) v=0;
+        if (!value)
+                v = 0;
        if (a == NULL)
                return 0;
-        a->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear, set on write */
+        a->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear, set on write */
-        if ((a->length < (w+1)) || (a->data == NULL))
+        if ((a->length < (w + 1)) || (a->data == NULL)) {
-                {
+                if (!value)
-                if (!value) return(1); /* Don't need to set */
+                        return(1); /* Don't need to set */
                if (a->data == NULL)
-                        c=(unsigned char *)malloc(w+1);
+                        c = (unsigned char *)malloc(w + 1);
                else
-                        c=(unsigned char *)OPENSSL_realloc_clean(a->data,
+                        c = (unsigned char *)OPENSSL_realloc_clean(a->data,
-                                                                 a->length,
+                            a->length, w + 1);
-                                                                 w+1);
+                if (c == NULL) {
-                if (c == NULL)
+                        ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT, ERR_R_MALLOC_FAILURE);
-                        {
-                        ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT,ERR_R_MALLOC_FAILURE);
                        return 0;
-                        }
+                }
-                if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length);
+                if (w + 1 - a->length > 0)
-                a->data=c;
+                        memset(c + a->length, 0, w + 1 - a->length);
-                a->length=w+1;
+                a->data = c;
+                a->length = w + 1;
        }
-        a->data[w]=((a->data[w])&iv)|v;
+        a->data[w] = ((a->data[w]) & iv) | v;
-        while ((a->length > 0) && (a->data[a->length-1] == 0))
+        while ((a->length > 0) && (a->data[a->length - 1] == 0))
                a->length--;
-        return(1);
-        }
-int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
+        return (1);
-        {
+}
-        int w,v;
-        w=n/8;
+int
-        v=1<<(7-(n&0x07));
+ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
-        if ((a == NULL) || (a->length < (w+1)) || (a->data == NULL))
+{
-                return(0);
+        int w, v;
-        return((a->data[w]&v) != 0);
-        }
+        w = n / 8;
+        v = 1 << (7 - (n & 0x07));
+        if ((a == NULL) || (a->length < (w + 1)) || (a->data == NULL))
+                return (0);
+        return ((a->data[w] & v) != 0);
+}
 /*
- * Checks if the given bit string contains only bits specified by 
+ * Checks if the given bit string contains only bits specified by
 * the flags vector. Returns 0 if there is at least one bit set in 'a'
 * which is not specified in 'flags', 1 otherwise.
 * 'len' is the length of 'flags'.
 */
-int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
+int
-                          unsigned char *flags, int flags_len)
+ASN1_BIT_STRING_check(ASN1_BIT_STRING *a, unsigned char *flags, int flags_len)
-        {
+{
        int i, ok;
        /* Check if there is one bit set at all. */
-        if (!a || !a->data) return 1;
+        if (!a || !a->data)
+                return 1;
        /* Check each byte of the internal representation of the bit string. */
        ok = 1;
-        for (i = 0; i < a->length && ok; ++i)
+        for (i = 0; i < a->length && ok; ++i) {
-                {
                unsigned char mask = i < flags_len ? ~flags[i] : 0xff;
                /* We are done if there is an unneeded bit set. */
                ok = (a->data[i] & mask) == 0;
-                }
-        return ok;
        }
+        return ok;
+}
diff --git a/src/lib/libcrypto/asn1/a_bool.c b/src/lib/libcrypto/asn1/a_bool.c
index 331acdf053..c8c180d6f7 100644
--- a/src/lib/libcrypto/asn1/a_bool.c
+++ b/src/lib/libcrypto/asn1/a_bool.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
@@ -60,55 +60,55 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
+int
-        {
+i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
+{
        int r;
        unsigned char *p;
-        r=ASN1_object_size(0,1,V_ASN1_BOOLEAN);
+        r = ASN1_object_size(0, 1, V_ASN1_BOOLEAN);
-        if (pp == NULL) return(r);
+        if (pp == NULL)
-        p= *pp;
+                return (r);
+        p = *pp;
-        ASN1_put_object(&p,0,1,V_ASN1_BOOLEAN,V_ASN1_UNIVERSAL);
+        ASN1_put_object(&p, 0, 1, V_ASN1_BOOLEAN, V_ASN1_UNIVERSAL);
-        *(p++)= (unsigned char)a;
+        *(p++) = (unsigned char)a;
-        *pp=p;
+        *pp = p;
-        return(r);
+        return (r);
-        }
+}
-int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)
+int
-        {
+d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)
-        int ret= -1;
+{
+        int ret = -1;
        const unsigned char *p;
        long len;
-        int inf,tag,xclass;
+        int inf, tag, xclass;
-        int i=0;
+        int i = 0;
-        p= *pp;
+        p = *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
+        inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-        if (inf & 0x80)
+        if (inf & 0x80) {
-                {
+                i = ASN1_R_BAD_OBJECT_HEADER;
-                i=ASN1_R_BAD_OBJECT_HEADER;
                goto err;
-                }
+        }
-        if (tag != V_ASN1_BOOLEAN)
+        if (tag != V_ASN1_BOOLEAN) {
-                {
+                i = ASN1_R_EXPECTING_A_BOOLEAN;
-                i=ASN1_R_EXPECTING_A_BOOLEAN;
                goto err;
-                }
+        }
-        if (len != 1)
+        if (len != 1) {
-                {
+                i = ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
-                i=ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
                goto err;
-                }
-        ret= (int)*(p++);
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,i);
-        return(ret);
        }
+        ret = (int)*(p++);
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
+err:
+        ASN1err(ASN1_F_D2I_ASN1_BOOLEAN, i);
+        return (ret);
+}
diff --git a/src/lib/libcrypto/asn1/a_bytes.c b/src/lib/libcrypto/asn1/a_bytes.c
index 8431d89edf..30647c97b5 100644
--- a/src/lib/libcrypto/asn1/a_bytes.c
+++ b/src/lib/libcrypto/asn1/a_bytes.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
@@ -63,252 +63,247 @@
 static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c);
 /* type is a 'bitmap' of acceptable string types.
 */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
+ASN1_STRING *
-             long length, int type)
+d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
-        {
+    long length, int type)
-        ASN1_STRING *ret=NULL;
+{
+        ASN1_STRING *ret = NULL;
        const unsigned char *p;
        unsigned char *s;
        long len;
-        int inf,tag,xclass;
+        int inf, tag, xclass;
-        int i=0;
+        int i = 0;
-        p= *pp;
+        p = *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
+        inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-        if (inf & 0x80) goto err;
+        if (inf & 0x80)
+                goto err;
-        if (tag >= 32)
+        if (tag >= 32) {
-                {
+                i = ASN1_R_TAG_VALUE_TOO_HIGH;
-                i=ASN1_R_TAG_VALUE_TOO_HIGH;
                goto err;
-                }
+        }
-        if (!(ASN1_tag2bit(tag) & type))
+        if (!(ASN1_tag2bit(tag) & type)) {
-                {
+                i = ASN1_R_WRONG_TYPE;
-                i=ASN1_R_WRONG_TYPE;
                goto err;
-                }
+        }
        /* If a bit-string, exit early */
        if (tag == V_ASN1_BIT_STRING)
-                return(d2i_ASN1_BIT_STRING(a,pp,length));
+                return (d2i_ASN1_BIT_STRING(a, pp, length));
-        if ((a == NULL) || ((*a) == NULL))
+        if ((a == NULL) || ((*a) == NULL)) {
-                {
+                if ((ret = ASN1_STRING_new()) == NULL)
-                if ((ret=ASN1_STRING_new()) == NULL) return(NULL);
+                        return (NULL);
-                }
+        } else
-        else
+                ret = (*a);
-                ret=(*a);
+        if (len != 0) {
-        if (len != 0)
+                s = (unsigned char *)malloc((int)len + 1);
-                {
+                if (s == NULL) {
-                s=(unsigned char *)malloc((int)len+1);
+                        i = ERR_R_MALLOC_FAILURE;
-                if (s == NULL)
-                        {
-                        i=ERR_R_MALLOC_FAILURE;
                        goto err;
-                        }
-                memcpy(s,p,(int)len);
-                s[len]='\0';
-                p+=len;
                }
-        else
+                memcpy(s, p, (int)len);
-                s=NULL;
+                s[len]='\0';
+                p += len;
-        if (ret->data != NULL) free(ret->data);
+        } else
-        ret->length=(int)len;
+                s = NULL;
-        ret->data=s;
-        ret->type=tag;
+        if (ret->data != NULL)
-        if (a != NULL) (*a)=ret;
+                free(ret->data);
-        *pp=p;
+        ret->length = (int)len;
-        return(ret);
+        ret->data = s;
+        ret->type = tag;
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
 err:
-        ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,i);
+        ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES, i);
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                ASN1_STRING_free(ret);
-        return(NULL);
+        return (NULL);
-        }
+}
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
+int
-        {
+i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
-        int ret,r,constructed;
+{
+        int ret, r, constructed;
        unsigned char *p;
-        if (a == NULL)  return(0);
+        if (a == NULL)
+                return (0);
        if (tag == V_ASN1_BIT_STRING)
-                return(i2d_ASN1_BIT_STRING(a,pp));
+                return (i2d_ASN1_BIT_STRING(a, pp));
-                
-        ret=a->length;
+        ret = a->length;
-        r=ASN1_object_size(0,ret,tag);
+        r = ASN1_object_size(0, ret, tag);
-        if (pp == NULL) return(r);
+        if (pp == NULL)
-        p= *pp;
+                return (r);
+        p = *pp;
        if ((tag == V_ASN1_SEQUENCE) || (tag == V_ASN1_SET))
-                constructed=1;
+                constructed = 1;
        else
-                constructed=0;
+                constructed = 0;
-        ASN1_put_object(&p,constructed,ret,tag,xclass);
+        ASN1_put_object(&p, constructed, ret, tag, xclass);
-        memcpy(p,a->data,a->length);
+        memcpy(p, a->data, a->length);
-        p+=a->length;
+        p += a->length;
-        *pp= p;
+        *pp = p;
-        return(r);
+        return (r);
-        }
+}
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
+ASN1_STRING *
-             long length, int Ptag, int Pclass)
+d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-        {
+    long length, int Ptag, int Pclass)
-        ASN1_STRING *ret=NULL;
+{
+        ASN1_STRING *ret = NULL;
        const unsigned char *p;
        unsigned char *s;
        long len;
-        int inf,tag,xclass;
+        int inf, tag, xclass;
-        int i=0;
+        int i = 0;
-        if ((a == NULL) || ((*a) == NULL))
+        if ((a == NULL) || ((*a) == NULL)) {
-                {
+                if ((ret = ASN1_STRING_new()) == NULL)
-                if ((ret=ASN1_STRING_new()) == NULL) return(NULL);
+                        return (NULL);
-                }
+        } else
-        else
+                ret = (*a);
-                ret=(*a);
        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
+        inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-        if (inf & 0x80)
+        if (inf & 0x80) {
-                {
+                i = ASN1_R_BAD_OBJECT_HEADER;
-                i=ASN1_R_BAD_OBJECT_HEADER;
                goto err;
-                }
+        }
-        if (tag != Ptag)
+        if (tag != Ptag) {
-                {
+                i = ASN1_R_WRONG_TAG;
-                i=ASN1_R_WRONG_TAG;
                goto err;
-                }
+        }
-        if (inf & V_ASN1_CONSTRUCTED)
+        if (inf & V_ASN1_CONSTRUCTED) {
-                {
                ASN1_const_CTX c;
-                c.pp=pp;
+                c.pp = pp;
-                c.p=p;
+                c.p = p;
-                c.inf=inf;
+                c.inf = inf;
-                c.slen=len;
+                c.slen = len;
-                c.tag=Ptag;
+                c.tag = Ptag;
-                c.xclass=Pclass;
+                c.xclass = Pclass;
-                c.max=(length == 0)?0:(p+length);
+                c.max = (length == 0) ? 0 : (p + length);
-                if (!asn1_collate_primitive(ret,&c)) 
+                if (!asn1_collate_primitive(ret, &c))
-                        goto err; 
+                        goto err;
-                else
+                else {
-                        {
+                        p = c.p;
-                        p=c.p;
-                        }
                }
-        else
+        } else {
-                {
+                if (len != 0) {
-                if (len != 0)
+                        if ((ret->length < len) || (ret->data == NULL)) {
-                        {
+                                if (ret->data != NULL)
-                        if ((ret->length < len) || (ret->data == NULL))
+                                        free(ret->data);
-                                {
+                                s = (unsigned char *)malloc((int)len + 1);
-                                if (ret->data != NULL) free(ret->data);
+                                if (s == NULL) {
-                                s=(unsigned char *)malloc((int)len + 1);
+                                        i = ERR_R_MALLOC_FAILURE;
-                                if (s == NULL)
-                                        {
-                                        i=ERR_R_MALLOC_FAILURE;
                                        goto err;
-                                        }
                                }
-                        else
+                        } else
-                                s=ret->data;
+                                s = ret->data;
-                        memcpy(s,p,(int)len);
+                        memcpy(s, p, (int)len);
                        s[len] = '\0';
-                        p+=len;
+                        p += len;
-                        }
+                } else {
-                else
+                        s = NULL;
-                        {
+                        if (ret->data != NULL)
-                        s=NULL;
+                                free(ret->data);
-                        if (ret->data != NULL) free(ret->data);
-                        }
-                ret->length=(int)len;
-                ret->data=s;
-                ret->type=Ptag;
                }
-        if (a != NULL) (*a)=ret;
+                ret->length = (int)len;
-        *pp=p;
+                ret->data = s;
-        return(ret);
+                ret->type = Ptag;
+        }
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
 err:
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                ASN1_STRING_free(ret);
-        ASN1err(ASN1_F_D2I_ASN1_BYTES,i);
+        ASN1err(ASN1_F_D2I_ASN1_BYTES, i);
-        return(NULL);
+        return (NULL);
-        }
+}
 /* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapse
 * them into the one structure that is then returned */
 /* There have been a few bug fixes for this function from
 * Paul Keogh <paul.keogh@sse.ie>, many thanks to him */
-static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c)
+static int
-        {
+asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c)
-        ASN1_STRING *os=NULL;
+{
+        ASN1_STRING *os = NULL;
        BUF_MEM b;
        int num;
-        b.length=0;
+        b.length = 0;
-        b.max=0;
+        b.max = 0;
-        b.data=NULL;
+        b.data = NULL;
-        if (a == NULL)
+        if (a == NULL) {
-                {
+                c->error = ERR_R_PASSED_NULL_PARAMETER;
-                c->error=ERR_R_PASSED_NULL_PARAMETER;
                goto err;
+        }
+        num = 0;
+        for (;;) {
+                if (c->inf & 1) {
+                        c->eos = ASN1_const_check_infinite_end(&c->p,
+                            (long)(c->max - c->p));
+                        if (c->eos)
+                                break;
+                } else {
+                        if (c->slen <= 0)
+                                break;
                }
-        num=0;
+                c->q = c->p;
-        for (;;)
+                if (d2i_ASN1_bytes(&os, &c->p, c->max - c->p, c->tag,
-                {
+                    c->xclass) == NULL) {
-                if (c->inf & 1)
+                        c->error = ERR_R_ASN1_LIB;
-                        {
-                        c->eos=ASN1_const_check_infinite_end(&c->p,
-                                (long)(c->max-c->p));
-                        if (c->eos) break;
-                        }
-                else
-                        {
-                        if (c->slen <= 0) break;
-                        }
-                c->q=c->p;
-                if (d2i_ASN1_bytes(&os,&c->p,c->max-c->p,c->tag,c->xclass)
-                        == NULL)
-                        {
-                        c->error=ERR_R_ASN1_LIB;
                        goto err;
-                        }
+                }
-                if (!BUF_MEM_grow_clean(&b,num+os->length))
+                if (!BUF_MEM_grow_clean(&b, num + os->length)) {
-                        {
+                        c->error = ERR_R_BUF_LIB;
-                        c->error=ERR_R_BUF_LIB;
                        goto err;
-                        }
-                memcpy(&(b.data[num]),os->data,os->length);
-                if (!(c->inf & 1))
-                        c->slen-=(c->p-c->q);
-                num+=os->length;
                }
+                memcpy(&(b.data[num]), os->data, os->length);
+                if (!(c->inf & 1))
+                        c->slen -= (c->p - c->q);
+                num += os->length;
+        }
+        if (!asn1_const_Finish(c))
+                goto err;
-        if (!asn1_const_Finish(c)) goto err;
+        a->length = num;
+        if (a->data != NULL)
+                free(a->data);
+        a->data = (unsigned char *)b.data;
+        if (os != NULL)
+                ASN1_STRING_free(os);
+        return (1);
-        a->length=num;
-        if (a->data != NULL) free(a->data);
-        a->data=(unsigned char *)b.data;
-        if (os != NULL) ASN1_STRING_free(os);
-        return(1);
 err:
-        ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE,c->error);
+        ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE, c->error);
-        if (os != NULL) ASN1_STRING_free(os);
+        if (os != NULL)
-        if (b.data != NULL) free(b.data);
+                ASN1_STRING_free(os);
-        return(0);
+        if (b.data != NULL)
-        }
+                free(b.data);
+        return (0);
+}
diff --git a/src/lib/libcrypto/asn1/a_d2i_fp.c b/src/lib/libcrypto/asn1/a_d2i_fp.c
index 52b2ebdb63..af7a4bac30 100644
--- a/src/lib/libcrypto/asn1/a_d2i_fp.c
+++ b/src/lib/libcrypto/asn1/a_d2i_fp.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
@@ -67,220 +67,208 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 #ifndef NO_OLD_ASN1
 #ifndef OPENSSL_NO_FP_API
-void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
+void *
-        {
+ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
-        BIO *b;
+{
-        void *ret;
+        BIO *b;
+        void *ret;
-        if ((b=BIO_new(BIO_s_file())) == NULL)
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
-                {
+                ASN1err(ASN1_F_ASN1_D2I_FP, ERR_R_BUF_LIB);
-                ASN1err(ASN1_F_ASN1_D2I_FP,ERR_R_BUF_LIB);
+                return (NULL);
-                return(NULL);
+        }
-                }
+        BIO_set_fp(b, in, BIO_NOCLOSE);
-        BIO_set_fp(b,in,BIO_NOCLOSE);
+        ret = ASN1_d2i_bio(xnew, d2i, b, x);
-        ret=ASN1_d2i_bio(xnew,d2i,b,x);
+        BIO_free(b);
-        BIO_free(b);
+        return (ret);
-        return(ret);
+}
-        }
 #endif
-void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
+void *
-        {
+ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
+{
        BUF_MEM *b = NULL;
        const unsigned char *p;
-        void *ret=NULL;
+        void *ret = NULL;
        int len;
        len = asn1_d2i_read_bio(in, &b);
-        if(len < 0) goto err;
+        if (len < 0)
+                goto err;
+        p = (unsigned char *)b->data;
+        ret = d2i(x, &p, len);
-        p=(unsigned char *)b->data;
-        ret=d2i(x,&p,len);
 err:
-        if (b != NULL) BUF_MEM_free(b);
+        if (b != NULL)
-        return(ret);
+                BUF_MEM_free(b);
-        }
+        return (ret);
+}
 #endif
-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x)
+void *
-        {
+ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x)
+{
        BUF_MEM *b = NULL;
        const unsigned char *p;
-        void *ret=NULL;
+        void *ret = NULL;
        int len;
        len = asn1_d2i_read_bio(in, &b);
-        if(len < 0) goto err;
+        if (len < 0)
+                goto err;
+        p = (const unsigned char *)b->data;
+        ret = ASN1_item_d2i(x, &p, len, it);
-        p=(const unsigned char *)b->data;
-        ret=ASN1_item_d2i(x,&p,len, it);
 err:
-        if (b != NULL) BUF_MEM_free(b);
+        if (b != NULL)
-        return(ret);
+                BUF_MEM_free(b);
-        }
+        return (ret);
+}
 #ifndef OPENSSL_NO_FP_API
-void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
+void *
-        {
+ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
-        BIO *b;
+{
-        char *ret;
+        BIO *b;
+        char *ret;
-        if ((b=BIO_new(BIO_s_file())) == NULL)
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
-                {
+                ASN1err(ASN1_F_ASN1_ITEM_D2I_FP, ERR_R_BUF_LIB);
-                ASN1err(ASN1_F_ASN1_ITEM_D2I_FP,ERR_R_BUF_LIB);
+                return (NULL);
-                return(NULL);
+        }
-                }
+        BIO_set_fp(b, in, BIO_NOCLOSE);
-        BIO_set_fp(b,in,BIO_NOCLOSE);
+        ret = ASN1_item_d2i_bio(it, b, x);
-        ret=ASN1_item_d2i_bio(it,b,x);
+        BIO_free(b);
-        BIO_free(b);
+        return (ret);
-        return(ret);
+}
-        }
 #endif
 #define HEADER_SIZE   8
-static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
+static int
-        {
+asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
+{
        BUF_MEM *b;
        unsigned char *p;
        int i;
        ASN1_const_CTX c;
-        size_t want=HEADER_SIZE;
+        size_t want = HEADER_SIZE;
-        int eos=0;
+        int eos = 0;
-        size_t off=0;
+        size_t off = 0;
-        size_t len=0;
+        size_t len = 0;
-        b=BUF_MEM_new();
+        b = BUF_MEM_new();
-        if (b == NULL)
+        if (b == NULL) {
-                {
+                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
-                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                return -1;
-                }
+        }
        ERR_clear_error();
-        for (;;)
+        for (;;) {
-                {
+                if (want >= (len - off)) {
-                if (want >= (len-off))
+                        want -= (len - off);
-                        {
-                        want-=(len-off);
-                        if (len + want < len || !BUF_MEM_grow_clean(b,len+want))
+                        if (len + want < len || !BUF_MEM_grow_clean(b, len + want)) {
-                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                                goto err;
-                                }
+                        }
-                        i=BIO_read(in,&(b->data[len]),want);
+                        i = BIO_read(in, &(b->data[len]), want);
-                        if ((i < 0) && ((len-off) == 0))
+                        if ((i < 0) && ((len - off) == 0)) {
-                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_NOT_ENOUGH_DATA);
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_NOT_ENOUGH_DATA);
                                goto err;
-                                }
+                        }
-                        if (i > 0)
+                        if (i > 0) {
-                                {
+                                if (len + i < len) {
-                                if (len+i < len)
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
-                                        {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
                                        goto err;
-                                        }
-                                len+=i;
                                }
+                                len += i;
                        }
+                }
                /* else data already loaded */
-                p=(unsigned char *)&(b->data[off]);
+                p = (unsigned char *) & (b->data[off]);
-                c.p=p;
+                c.p = p;
-                c.inf=ASN1_get_object(&(c.p),&(c.slen),&(c.tag),&(c.xclass),
+                c.inf = ASN1_get_object(&(c.p), &(c.slen), &(c.tag),
-                        len-off);
+                    &(c.xclass), len - off);
-                if (c.inf & 0x80)
+                if (c.inf & 0x80) {
-                        {
                        unsigned long e;
-                        e=ERR_GET_REASON(ERR_peek_error());
+                        e = ERR_GET_REASON(ERR_peek_error());
                        if (e != ASN1_R_TOO_LONG)
                                goto err;
                        else
                                ERR_clear_error(); /* clear error */
-                        }
+                }
-                i=c.p-p;/* header length */
+                i = c.p - p;    /* header length */
-                off+=i; /* end of data */
+                off += i;       /* end of data */
-                if (c.inf & 1)
+                if (c.inf & 1) {
-                        {
                        /* no data body so go round again */
                        eos++;
-                        if (eos < 0)
+                        if (eos < 0) {
-                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_HEADER_TOO_LONG);
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_HEADER_TOO_LONG);
                                goto err;
-                                }
-                        want=HEADER_SIZE;
                        }
-                else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC))
+                        want = HEADER_SIZE;
-                        {
+                } else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC)) {
                        /* eos value, so go back and read another header */
                        eos--;
                        if (eos <= 0)
                                break;
                        else
-                                want=HEADER_SIZE;
+                                want = HEADER_SIZE;
-                        }
+                } else {
-                else 
-                        {
                        /* suck in c.slen bytes of data */
-                        want=c.slen;
+                        want = c.slen;
-                        if (want > (len-off))
+                        if (want > (len - off)) {
-                                {
+                                want -= (len - off);
-                                want-=(len-off);
                                if (want > INT_MAX /* BIO_read takes an int length */ ||
-                                        len+want < len)
+                                    len+want < len) {
-                                                {
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
-                                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
-                                                goto err;
-                                                }
-                                if (!BUF_MEM_grow_clean(b,len+want))
-                                        {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                                        goto err;
-                                        }
+                                }
-                                while (want > 0)
+                                if (!BUF_MEM_grow_clean(b, len + want)) {
-                                        {
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
-                                        i=BIO_read(in,&(b->data[len]),want);
+                                        goto err;
-                                        if (i <= 0)
+                                }
-                                                {
+                                while (want > 0) {
+                                        i = BIO_read(in, &(b->data[len]), want);
+                                        if (i <= 0) {
                                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
                                                    ASN1_R_NOT_ENOUGH_DATA);
                                                goto err;
-                                                }
+                                        }
                                        /* This can't overflow because
                                         * |len+want| didn't overflow. */
-                                        len+=i;
+                                        len += i;
-                                        want-=i;
+                                        want -= i;
-                                        }
                                }
-                        if (off + c.slen < off)
+                        }
-                                {
+                        if (off + c.slen < off) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
                                goto err;
-                                }
-                        off+=c.slen;
-                        if (eos <= 0)
-                                {
-                                break;
-                                }
-                        else
-                                want=HEADER_SIZE;
                        }
+                        off += c.slen;
+                        if (eos <= 0) {
+                                break;
+                        } else
+                                want = HEADER_SIZE;
                }
+        }
-        if (off > INT_MAX)
+        if (off > INT_MAX) {
-                {
+                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
-                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
                goto err;
-                }
+        }
        *pb = b;
        return off;
 err:
-        if (b != NULL) BUF_MEM_free(b);
+        if (b != NULL)
+                BUF_MEM_free(b);
        return -1;
-        }
+}
diff --git a/src/lib/libssl/src/crypto/asn1/a_bitstr.c b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
index e2b65bf2ac..5633cfca1c 100644
--- a/src/lib/libssl/src/crypto/asn1/a_bitstr.c
+++ b/src/lib/libssl/src/crypto/asn1/a_bitstr.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
@@ -60,82 +60,91 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
-int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
+int
-{ return M_ASN1_BIT_STRING_set(x, d, len); }
+ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
+{
+        return M_ASN1_BIT_STRING_set(x, d, len);
+}
-int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
+int
-        {
+i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
-        int ret,j,bits,len;
+{
-        unsigned char *p,*d;
+        int ret, j,bits, len;
+        unsigned char *p, *d;
-        if (a == NULL) return(0);
+        if (a == NULL)
+                return (0);
-        len=a->length;
+        len = a->length;
-        if (len > 0)
+        if (len > 0) {
-                {
+                if (a->flags & ASN1_STRING_FLAG_BITS_LEFT) {
-                if (a->flags & ASN1_STRING_FLAG_BITS_LEFT)
+                        bits = (int)a->flags & 0x07;
-                        {
+                } else {
-                        bits=(int)a->flags&0x07;
+                        for (; len > 0; len--) {
-                        }
+                                if (a->data[len - 1])
-                else
+                                        break;
-                        {
-                        for ( ; len > 0; len--)
-                                {
-                                if (a->data[len-1]) break;
-                                }
-                        j=a->data[len-1];
-                        if      (j & 0x01) bits=0;
-                        else if (j & 0x02) bits=1;
-                        else if (j & 0x04) bits=2;
-                        else if (j & 0x08) bits=3;
-                        else if (j & 0x10) bits=4;
-                        else if (j & 0x20) bits=5;
-                        else if (j & 0x40) bits=6;
-                        else if (j & 0x80) bits=7;
-                        else bits=0; /* should not happen */
                        }
+                        j = a->data[len - 1];
+                        if (j & 0x01)
+                                bits = 0;
+                        else if (j & 0x02)
+                                bits = 1;
+                        else if (j & 0x04)
+                                bits = 2;
+                        else if (j & 0x08)
+                                bits = 3;
+                        else if (j & 0x10)
+                                bits = 4;
+                        else if (j & 0x20)
+                                bits = 5;
+                        else if (j & 0x40)
+                                bits = 6;
+                        else if (j & 0x80)
+                                bits = 7;
+                        else
+                                bits = 0; /* should not happen */
                }
-        else
+        } else
-                bits=0;
+                bits = 0;
-        ret=1+len;
+        ret = 1 + len;
-        if (pp == NULL) return(ret);
+        if (pp == NULL)
+                return (ret);
        p= *pp;
-        *(p++)=(unsigned char)bits;
+        *(p++) = (unsigned char)bits;
-        d=a->data;
+        d = a->data;
-        memcpy(p,d,len);
+        memcpy(p, d, len);
-        p+=len;
+        p += len;
-        if (len > 0) p[-1]&=(0xff<<bits);
+        if (len > 0)
-        *pp=p;
+                p[-1]&=(0xff << bits);
-        return(ret);
+        *pp = p;
-        }
+        return (ret);
+}
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
+ASN1_BIT_STRING *
-        const unsigned char **pp, long len)
+c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **pp, long len)
-        {
+{
-        ASN1_BIT_STRING *ret=NULL;
+        ASN1_BIT_STRING *ret = NULL;
        const unsigned char *p;
        unsigned char *s;
        int i;
-        if (len < 1)
+        if (len < 1) {
-                {
+                i = ASN1_R_STRING_TOO_SHORT;
-                i=ASN1_R_STRING_TOO_SHORT;
                goto err;
-                }
+        }
-        if ((a == NULL) || ((*a) == NULL))
+        if ((a == NULL) || ((*a) == NULL)) {
-                {
+                if ((ret = M_ASN1_BIT_STRING_new()) == NULL)
-                if ((ret=M_ASN1_BIT_STRING_new()) == NULL) return(NULL);
+                        return (NULL);
-                }
+        } else
-        else
+                ret = (*a);
-                ret=(*a);
-        p= *pp;
+        p = *pp;
-        i= *(p++);
+        i = *(p++);
        /* We do this to preserve the settings.  If we modify
         * the settings, via the _set_bit function, we will recalculate
         * on output */
@@ -143,106 +152,111 @@ ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
        ret->flags|=(ASN1_STRING_FLAG_BITS_LEFT|(i&0x07)); /* set */
        if (len-- > 1) /* using one because of the bits left byte */
-                {
+        {
-                s=(unsigned char *)malloc((int)len);
+                s = (unsigned char *)malloc((int)len);
-                if (s == NULL)
+                if (s == NULL) {
-                        {
+                        i = ERR_R_MALLOC_FAILURE;
-                        i=ERR_R_MALLOC_FAILURE;
                        goto err;
-                        }
-                memcpy(s,p,(int)len);
-                s[len-1]&=(0xff<<i);
-                p+=len;
                }
-        else
+                memcpy(s, p, (int)len);
-                s=NULL;
+                s[len - 1] &= (0xff << i);
+                p += len;
-        ret->length=(int)len;
+        } else
-        if (ret->data != NULL) free(ret->data);
+                s = NULL;
-        ret->data=s;
-        ret->type=V_ASN1_BIT_STRING;
+        ret->length = (int)len;
-        if (a != NULL) (*a)=ret;
+        if (ret->data != NULL)
-        *pp=p;
+                free(ret->data);
-        return(ret);
+        ret->data = s;
+        ret->type = V_ASN1_BIT_STRING;
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
 err:
-        ASN1err(ASN1_F_C2I_ASN1_BIT_STRING,i);
+        ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                M_ASN1_BIT_STRING_free(ret);
-        return(NULL);
+        return (NULL);
-        }
+}
 /* These next 2 functions from Goetz Babin-Ebell <babinebell@trustcenter.de>
 */
-int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
+int
-        {
+ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
-        int w,v,iv;
+{
+        int w, v, iv;
        unsigned char *c;
-        w=n/8;
+        w = n/8;
-        v=1<<(7-(n&0x07));
+        v = 1 << (7 - (n & 0x07));
-        iv= ~v;
+        iv = ~v;
-        if (!value) v=0;
+        if (!value)
+                v = 0;
        if (a == NULL)
                return 0;
-        a->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear, set on write */
+        a->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear, set on write */
-        if ((a->length < (w+1)) || (a->data == NULL))
+        if ((a->length < (w + 1)) || (a->data == NULL)) {
-                {
+                if (!value)
-                if (!value) return(1); /* Don't need to set */
+                        return(1); /* Don't need to set */
                if (a->data == NULL)
-                        c=(unsigned char *)malloc(w+1);
+                        c = (unsigned char *)malloc(w + 1);
                else
-                        c=(unsigned char *)OPENSSL_realloc_clean(a->data,
+                        c = (unsigned char *)OPENSSL_realloc_clean(a->data,
-                                                                 a->length,
+                            a->length, w + 1);
-                                                                 w+1);
+                if (c == NULL) {
-                if (c == NULL)
+                        ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT, ERR_R_MALLOC_FAILURE);
-                        {
-                        ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT,ERR_R_MALLOC_FAILURE);
                        return 0;
-                        }
+                }
-                if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length);
+                if (w + 1 - a->length > 0)
-                a->data=c;
+                        memset(c + a->length, 0, w + 1 - a->length);
-                a->length=w+1;
+                a->data = c;
+                a->length = w + 1;
        }
-        a->data[w]=((a->data[w])&iv)|v;
+        a->data[w] = ((a->data[w]) & iv) | v;
-        while ((a->length > 0) && (a->data[a->length-1] == 0))
+        while ((a->length > 0) && (a->data[a->length - 1] == 0))
                a->length--;
-        return(1);
-        }
-int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
+        return (1);
-        {
+}
-        int w,v;
-        w=n/8;
+int
-        v=1<<(7-(n&0x07));
+ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
-        if ((a == NULL) || (a->length < (w+1)) || (a->data == NULL))
+{
-                return(0);
+        int w, v;
-        return((a->data[w]&v) != 0);
-        }
+        w = n / 8;
+        v = 1 << (7 - (n & 0x07));
+        if ((a == NULL) || (a->length < (w + 1)) || (a->data == NULL))
+                return (0);
+        return ((a->data[w] & v) != 0);
+}
 /*
- * Checks if the given bit string contains only bits specified by 
+ * Checks if the given bit string contains only bits specified by
 * the flags vector. Returns 0 if there is at least one bit set in 'a'
 * which is not specified in 'flags', 1 otherwise.
 * 'len' is the length of 'flags'.
 */
-int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
+int
-                          unsigned char *flags, int flags_len)
+ASN1_BIT_STRING_check(ASN1_BIT_STRING *a, unsigned char *flags, int flags_len)
-        {
+{
        int i, ok;
        /* Check if there is one bit set at all. */
-        if (!a || !a->data) return 1;
+        if (!a || !a->data)
+                return 1;
        /* Check each byte of the internal representation of the bit string. */
        ok = 1;
-        for (i = 0; i < a->length && ok; ++i)
+        for (i = 0; i < a->length && ok; ++i) {
-                {
                unsigned char mask = i < flags_len ? ~flags[i] : 0xff;
                /* We are done if there is an unneeded bit set. */
                ok = (a->data[i] & mask) == 0;
-                }
-        return ok;
        }
+        return ok;
+}
diff --git a/src/lib/libssl/src/crypto/asn1/a_bool.c b/src/lib/libssl/src/crypto/asn1/a_bool.c
index 331acdf053..c8c180d6f7 100644
--- a/src/lib/libssl/src/crypto/asn1/a_bool.c
+++ b/src/lib/libssl/src/crypto/asn1/a_bool.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
@@ -60,55 +60,55 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
+int
-        {
+i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
+{
        int r;
        unsigned char *p;
-        r=ASN1_object_size(0,1,V_ASN1_BOOLEAN);
+        r = ASN1_object_size(0, 1, V_ASN1_BOOLEAN);
-        if (pp == NULL) return(r);
+        if (pp == NULL)
-        p= *pp;
+                return (r);
+        p = *pp;
-        ASN1_put_object(&p,0,1,V_ASN1_BOOLEAN,V_ASN1_UNIVERSAL);
+        ASN1_put_object(&p, 0, 1, V_ASN1_BOOLEAN, V_ASN1_UNIVERSAL);
-        *(p++)= (unsigned char)a;
+        *(p++) = (unsigned char)a;
-        *pp=p;
+        *pp = p;
-        return(r);
+        return (r);
-        }
+}
-int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)
+int
-        {
+d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)
-        int ret= -1;
+{
+        int ret = -1;
        const unsigned char *p;
        long len;
-        int inf,tag,xclass;
+        int inf, tag, xclass;
-        int i=0;
+        int i = 0;
-        p= *pp;
+        p = *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
+        inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-        if (inf & 0x80)
+        if (inf & 0x80) {
-                {
+                i = ASN1_R_BAD_OBJECT_HEADER;
-                i=ASN1_R_BAD_OBJECT_HEADER;
                goto err;
-                }
+        }
-        if (tag != V_ASN1_BOOLEAN)
+        if (tag != V_ASN1_BOOLEAN) {
-                {
+                i = ASN1_R_EXPECTING_A_BOOLEAN;
-                i=ASN1_R_EXPECTING_A_BOOLEAN;
                goto err;
-                }
+        }
-        if (len != 1)
+        if (len != 1) {
-                {
+                i = ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
-                i=ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
                goto err;
-                }
-        ret= (int)*(p++);
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,i);
-        return(ret);
        }
+        ret = (int)*(p++);
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
+err:
+        ASN1err(ASN1_F_D2I_ASN1_BOOLEAN, i);
+        return (ret);
+}
diff --git a/src/lib/libssl/src/crypto/asn1/a_bytes.c b/src/lib/libssl/src/crypto/asn1/a_bytes.c
index 8431d89edf..30647c97b5 100644
--- a/src/lib/libssl/src/crypto/asn1/a_bytes.c
+++ b/src/lib/libssl/src/crypto/asn1/a_bytes.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
@@ -63,252 +63,247 @@
 static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c);
 /* type is a 'bitmap' of acceptable string types.
 */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
+ASN1_STRING *
-             long length, int type)
+d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
-        {
+    long length, int type)
-        ASN1_STRING *ret=NULL;
+{
+        ASN1_STRING *ret = NULL;
        const unsigned char *p;
        unsigned char *s;
        long len;
-        int inf,tag,xclass;
+        int inf, tag, xclass;
-        int i=0;
+        int i = 0;
-        p= *pp;
+        p = *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
+        inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-        if (inf & 0x80) goto err;
+        if (inf & 0x80)
+                goto err;
-        if (tag >= 32)
+        if (tag >= 32) {
-                {
+                i = ASN1_R_TAG_VALUE_TOO_HIGH;
-                i=ASN1_R_TAG_VALUE_TOO_HIGH;
                goto err;
-                }
+        }
-        if (!(ASN1_tag2bit(tag) & type))
+        if (!(ASN1_tag2bit(tag) & type)) {
-                {
+                i = ASN1_R_WRONG_TYPE;
-                i=ASN1_R_WRONG_TYPE;
                goto err;
-                }
+        }
        /* If a bit-string, exit early */
        if (tag == V_ASN1_BIT_STRING)
-                return(d2i_ASN1_BIT_STRING(a,pp,length));
+                return (d2i_ASN1_BIT_STRING(a, pp, length));
-        if ((a == NULL) || ((*a) == NULL))
+        if ((a == NULL) || ((*a) == NULL)) {
-                {
+                if ((ret = ASN1_STRING_new()) == NULL)
-                if ((ret=ASN1_STRING_new()) == NULL) return(NULL);
+                        return (NULL);
-                }
+        } else
-        else
+                ret = (*a);
-                ret=(*a);
+        if (len != 0) {
-        if (len != 0)
+                s = (unsigned char *)malloc((int)len + 1);
-                {
+                if (s == NULL) {
-                s=(unsigned char *)malloc((int)len+1);
+                        i = ERR_R_MALLOC_FAILURE;
-                if (s == NULL)
-                        {
-                        i=ERR_R_MALLOC_FAILURE;
                        goto err;
-                        }
-                memcpy(s,p,(int)len);
-                s[len]='\0';
-                p+=len;
                }
-        else
+                memcpy(s, p, (int)len);
-                s=NULL;
+                s[len]='\0';
+                p += len;
-        if (ret->data != NULL) free(ret->data);
+        } else
-        ret->length=(int)len;
+                s = NULL;
-        ret->data=s;
-        ret->type=tag;
+        if (ret->data != NULL)
-        if (a != NULL) (*a)=ret;
+                free(ret->data);
-        *pp=p;
+        ret->length = (int)len;
-        return(ret);
+        ret->data = s;
+        ret->type = tag;
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
 err:
-        ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,i);
+        ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES, i);
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                ASN1_STRING_free(ret);
-        return(NULL);
+        return (NULL);
-        }
+}
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
+int
-        {
+i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
-        int ret,r,constructed;
+{
+        int ret, r, constructed;
        unsigned char *p;
-        if (a == NULL)  return(0);
+        if (a == NULL)
+                return (0);
        if (tag == V_ASN1_BIT_STRING)
-                return(i2d_ASN1_BIT_STRING(a,pp));
+                return (i2d_ASN1_BIT_STRING(a, pp));
-                
-        ret=a->length;
+        ret = a->length;
-        r=ASN1_object_size(0,ret,tag);
+        r = ASN1_object_size(0, ret, tag);
-        if (pp == NULL) return(r);
+        if (pp == NULL)
-        p= *pp;
+                return (r);
+        p = *pp;
        if ((tag == V_ASN1_SEQUENCE) || (tag == V_ASN1_SET))
-                constructed=1;
+                constructed = 1;
        else
-                constructed=0;
+                constructed = 0;
-        ASN1_put_object(&p,constructed,ret,tag,xclass);
+        ASN1_put_object(&p, constructed, ret, tag, xclass);
-        memcpy(p,a->data,a->length);
+        memcpy(p, a->data, a->length);
-        p+=a->length;
+        p += a->length;
-        *pp= p;
+        *pp = p;
-        return(r);
+        return (r);
-        }
+}
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
+ASN1_STRING *
-             long length, int Ptag, int Pclass)
+d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-        {
+    long length, int Ptag, int Pclass)
-        ASN1_STRING *ret=NULL;
+{
+        ASN1_STRING *ret = NULL;
        const unsigned char *p;
        unsigned char *s;
        long len;
-        int inf,tag,xclass;
+        int inf, tag, xclass;
-        int i=0;
+        int i = 0;
-        if ((a == NULL) || ((*a) == NULL))
+        if ((a == NULL) || ((*a) == NULL)) {
-                {
+                if ((ret = ASN1_STRING_new()) == NULL)
-                if ((ret=ASN1_STRING_new()) == NULL) return(NULL);
+                        return (NULL);
-                }
+        } else
-        else
+                ret = (*a);
-                ret=(*a);
        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
+        inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
-        if (inf & 0x80)
+        if (inf & 0x80) {
-                {
+                i = ASN1_R_BAD_OBJECT_HEADER;
-                i=ASN1_R_BAD_OBJECT_HEADER;
                goto err;
-                }
+        }
-        if (tag != Ptag)
+        if (tag != Ptag) {
-                {
+                i = ASN1_R_WRONG_TAG;
-                i=ASN1_R_WRONG_TAG;
                goto err;
-                }
+        }
-        if (inf & V_ASN1_CONSTRUCTED)
+        if (inf & V_ASN1_CONSTRUCTED) {
-                {
                ASN1_const_CTX c;
-                c.pp=pp;
+                c.pp = pp;
-                c.p=p;
+                c.p = p;
-                c.inf=inf;
+                c.inf = inf;
-                c.slen=len;
+                c.slen = len;
-                c.tag=Ptag;
+                c.tag = Ptag;
-                c.xclass=Pclass;
+                c.xclass = Pclass;
-                c.max=(length == 0)?0:(p+length);
+                c.max = (length == 0) ? 0 : (p + length);
-                if (!asn1_collate_primitive(ret,&c)) 
+                if (!asn1_collate_primitive(ret, &c))
-                        goto err; 
+                        goto err;
-                else
+                else {
-                        {
+                        p = c.p;
-                        p=c.p;
-                        }
                }
-        else
+        } else {
-                {
+                if (len != 0) {
-                if (len != 0)
+                        if ((ret->length < len) || (ret->data == NULL)) {
-                        {
+                                if (ret->data != NULL)
-                        if ((ret->length < len) || (ret->data == NULL))
+                                        free(ret->data);
-                                {
+                                s = (unsigned char *)malloc((int)len + 1);
-                                if (ret->data != NULL) free(ret->data);
+                                if (s == NULL) {
-                                s=(unsigned char *)malloc((int)len + 1);
+                                        i = ERR_R_MALLOC_FAILURE;
-                                if (s == NULL)
-                                        {
-                                        i=ERR_R_MALLOC_FAILURE;
                                        goto err;
-                                        }
                                }
-                        else
+                        } else
-                                s=ret->data;
+                                s = ret->data;
-                        memcpy(s,p,(int)len);
+                        memcpy(s, p, (int)len);
                        s[len] = '\0';
-                        p+=len;
+                        p += len;
-                        }
+                } else {
-                else
+                        s = NULL;
-                        {
+                        if (ret->data != NULL)
-                        s=NULL;
+                                free(ret->data);
-                        if (ret->data != NULL) free(ret->data);
-                        }
-                ret->length=(int)len;
-                ret->data=s;
-                ret->type=Ptag;
                }
-        if (a != NULL) (*a)=ret;
+                ret->length = (int)len;
-        *pp=p;
+                ret->data = s;
-        return(ret);
+                ret->type = Ptag;
+        }
+        if (a != NULL)
+                (*a) = ret;
+        *pp = p;
+        return (ret);
 err:
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                ASN1_STRING_free(ret);
-        ASN1err(ASN1_F_D2I_ASN1_BYTES,i);
+        ASN1err(ASN1_F_D2I_ASN1_BYTES, i);
-        return(NULL);
+        return (NULL);
-        }
+}
 /* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapse
 * them into the one structure that is then returned */
 /* There have been a few bug fixes for this function from
 * Paul Keogh <paul.keogh@sse.ie>, many thanks to him */
-static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c)
+static int
-        {
+asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c)
-        ASN1_STRING *os=NULL;
+{
+        ASN1_STRING *os = NULL;
        BUF_MEM b;
        int num;
-        b.length=0;
+        b.length = 0;
-        b.max=0;
+        b.max = 0;
-        b.data=NULL;
+        b.data = NULL;
-        if (a == NULL)
+        if (a == NULL) {
-                {
+                c->error = ERR_R_PASSED_NULL_PARAMETER;
-                c->error=ERR_R_PASSED_NULL_PARAMETER;
                goto err;
+        }
+        num = 0;
+        for (;;) {
+                if (c->inf & 1) {
+                        c->eos = ASN1_const_check_infinite_end(&c->p,
+                            (long)(c->max - c->p));
+                        if (c->eos)
+                                break;
+                } else {
+                        if (c->slen <= 0)
+                                break;
                }
-        num=0;
+                c->q = c->p;
-        for (;;)
+                if (d2i_ASN1_bytes(&os, &c->p, c->max - c->p, c->tag,
-                {
+                    c->xclass) == NULL) {
-                if (c->inf & 1)
+                        c->error = ERR_R_ASN1_LIB;
-                        {
-                        c->eos=ASN1_const_check_infinite_end(&c->p,
-                                (long)(c->max-c->p));
-                        if (c->eos) break;
-                        }
-                else
-                        {
-                        if (c->slen <= 0) break;
-                        }
-                c->q=c->p;
-                if (d2i_ASN1_bytes(&os,&c->p,c->max-c->p,c->tag,c->xclass)
-                        == NULL)
-                        {
-                        c->error=ERR_R_ASN1_LIB;
                        goto err;
-                        }
+                }
-                if (!BUF_MEM_grow_clean(&b,num+os->length))
+                if (!BUF_MEM_grow_clean(&b, num + os->length)) {
-                        {
+                        c->error = ERR_R_BUF_LIB;
-                        c->error=ERR_R_BUF_LIB;
                        goto err;
-                        }
-                memcpy(&(b.data[num]),os->data,os->length);
-                if (!(c->inf & 1))
-                        c->slen-=(c->p-c->q);
-                num+=os->length;
                }
+                memcpy(&(b.data[num]), os->data, os->length);
+                if (!(c->inf & 1))
+                        c->slen -= (c->p - c->q);
+                num += os->length;
+        }
+        if (!asn1_const_Finish(c))
+                goto err;
-        if (!asn1_const_Finish(c)) goto err;
+        a->length = num;
+        if (a->data != NULL)
+                free(a->data);
+        a->data = (unsigned char *)b.data;
+        if (os != NULL)
+                ASN1_STRING_free(os);
+        return (1);
-        a->length=num;
-        if (a->data != NULL) free(a->data);
-        a->data=(unsigned char *)b.data;
-        if (os != NULL) ASN1_STRING_free(os);
-        return(1);
 err:
-        ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE,c->error);
+        ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE, c->error);
-        if (os != NULL) ASN1_STRING_free(os);
+        if (os != NULL)
-        if (b.data != NULL) free(b.data);
+                ASN1_STRING_free(os);
-        return(0);
+        if (b.data != NULL)
-        }
+                free(b.data);
+        return (0);
+}
diff --git a/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c b/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
index 52b2ebdb63..af7a4bac30 100644
--- a/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
+++ b/src/lib/libssl/src/crypto/asn1/a_d2i_fp.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
@@ -67,220 +67,208 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 #ifndef NO_OLD_ASN1
 #ifndef OPENSSL_NO_FP_API
-void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
+void *
-        {
+ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
-        BIO *b;
+{
-        void *ret;
+        BIO *b;
+        void *ret;
-        if ((b=BIO_new(BIO_s_file())) == NULL)
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
-                {
+                ASN1err(ASN1_F_ASN1_D2I_FP, ERR_R_BUF_LIB);
-                ASN1err(ASN1_F_ASN1_D2I_FP,ERR_R_BUF_LIB);
+                return (NULL);
-                return(NULL);
+        }
-                }
+        BIO_set_fp(b, in, BIO_NOCLOSE);
-        BIO_set_fp(b,in,BIO_NOCLOSE);
+        ret = ASN1_d2i_bio(xnew, d2i, b, x);
-        ret=ASN1_d2i_bio(xnew,d2i,b,x);
+        BIO_free(b);
-        BIO_free(b);
+        return (ret);
-        return(ret);
+}
-        }
 #endif
-void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
+void *
-        {
+ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
+{
        BUF_MEM *b = NULL;
        const unsigned char *p;
-        void *ret=NULL;
+        void *ret = NULL;
        int len;
        len = asn1_d2i_read_bio(in, &b);
-        if(len < 0) goto err;
+        if (len < 0)
+                goto err;
+        p = (unsigned char *)b->data;
+        ret = d2i(x, &p, len);
-        p=(unsigned char *)b->data;
-        ret=d2i(x,&p,len);
 err:
-        if (b != NULL) BUF_MEM_free(b);
+        if (b != NULL)
-        return(ret);
+                BUF_MEM_free(b);
-        }
+        return (ret);
+}
 #endif
-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x)
+void *
-        {
+ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x)
+{
        BUF_MEM *b = NULL;
        const unsigned char *p;
-        void *ret=NULL;
+        void *ret = NULL;
        int len;
        len = asn1_d2i_read_bio(in, &b);
-        if(len < 0) goto err;
+        if (len < 0)
+                goto err;
+        p = (const unsigned char *)b->data;
+        ret = ASN1_item_d2i(x, &p, len, it);
-        p=(const unsigned char *)b->data;
-        ret=ASN1_item_d2i(x,&p,len, it);
 err:
-        if (b != NULL) BUF_MEM_free(b);
+        if (b != NULL)
-        return(ret);
+                BUF_MEM_free(b);
-        }
+        return (ret);
+}
 #ifndef OPENSSL_NO_FP_API
-void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
+void *
-        {
+ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
-        BIO *b;
+{
-        char *ret;
+        BIO *b;
+        char *ret;
-        if ((b=BIO_new(BIO_s_file())) == NULL)
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
-                {
+                ASN1err(ASN1_F_ASN1_ITEM_D2I_FP, ERR_R_BUF_LIB);
-                ASN1err(ASN1_F_ASN1_ITEM_D2I_FP,ERR_R_BUF_LIB);
+                return (NULL);
-                return(NULL);
+        }
-                }
+        BIO_set_fp(b, in, BIO_NOCLOSE);
-        BIO_set_fp(b,in,BIO_NOCLOSE);
+        ret = ASN1_item_d2i_bio(it, b, x);
-        ret=ASN1_item_d2i_bio(it,b,x);
+        BIO_free(b);
-        BIO_free(b);
+        return (ret);
-        return(ret);
+}
-        }
 #endif
 #define HEADER_SIZE   8
-static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
+static int
-        {
+asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
+{
        BUF_MEM *b;
        unsigned char *p;
        int i;
        ASN1_const_CTX c;
-        size_t want=HEADER_SIZE;
+        size_t want = HEADER_SIZE;
-        int eos=0;
+        int eos = 0;
-        size_t off=0;
+        size_t off = 0;
-        size_t len=0;
+        size_t len = 0;
-        b=BUF_MEM_new();
+        b = BUF_MEM_new();
-        if (b == NULL)
+        if (b == NULL) {
-                {
+                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
-                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                return -1;
-                }
+        }
        ERR_clear_error();
-        for (;;)
+        for (;;) {
-                {
+                if (want >= (len - off)) {
-                if (want >= (len-off))
+                        want -= (len - off);
-                        {
-                        want-=(len-off);
-                        if (len + want < len || !BUF_MEM_grow_clean(b,len+want))
+                        if (len + want < len || !BUF_MEM_grow_clean(b, len + want)) {
-                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                                goto err;
-                                }
+                        }
-                        i=BIO_read(in,&(b->data[len]),want);
+                        i = BIO_read(in, &(b->data[len]), want);
-                        if ((i < 0) && ((len-off) == 0))
+                        if ((i < 0) && ((len - off) == 0)) {
-                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_NOT_ENOUGH_DATA);
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_NOT_ENOUGH_DATA);
                                goto err;
-                                }
+                        }
-                        if (i > 0)
+                        if (i > 0) {
-                                {
+                                if (len + i < len) {
-                                if (len+i < len)
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
-                                        {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
                                        goto err;
-                                        }
-                                len+=i;
                                }
+                                len += i;
                        }
+                }
                /* else data already loaded */
-                p=(unsigned char *)&(b->data[off]);
+                p = (unsigned char *) & (b->data[off]);
-                c.p=p;
+                c.p = p;
-                c.inf=ASN1_get_object(&(c.p),&(c.slen),&(c.tag),&(c.xclass),
+                c.inf = ASN1_get_object(&(c.p), &(c.slen), &(c.tag),
-                        len-off);
+                    &(c.xclass), len - off);
-                if (c.inf & 0x80)
+                if (c.inf & 0x80) {
-                        {
                        unsigned long e;
-                        e=ERR_GET_REASON(ERR_peek_error());
+                        e = ERR_GET_REASON(ERR_peek_error());
                        if (e != ASN1_R_TOO_LONG)
                                goto err;
                        else
                                ERR_clear_error(); /* clear error */
-                        }
+                }
-                i=c.p-p;/* header length */
+                i = c.p - p;    /* header length */
-                off+=i; /* end of data */
+                off += i;       /* end of data */
-                if (c.inf & 1)
+                if (c.inf & 1) {
-                        {
                        /* no data body so go round again */
                        eos++;
-                        if (eos < 0)
+                        if (eos < 0) {
-                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_HEADER_TOO_LONG);
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_HEADER_TOO_LONG);
                                goto err;
-                                }
-                        want=HEADER_SIZE;
                        }
-                else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC))
+                        want = HEADER_SIZE;
-                        {
+                } else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC)) {
                        /* eos value, so go back and read another header */
                        eos--;
                        if (eos <= 0)
                                break;
                        else
-                                want=HEADER_SIZE;
+                                want = HEADER_SIZE;
-                        }
+                } else {
-                else 
-                        {
                        /* suck in c.slen bytes of data */
-                        want=c.slen;
+                        want = c.slen;
-                        if (want > (len-off))
+                        if (want > (len - off)) {
-                                {
+                                want -= (len - off);
-                                want-=(len-off);
                                if (want > INT_MAX /* BIO_read takes an int length */ ||
-                                        len+want < len)
+                                    len+want < len) {
-                                                {
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
-                                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
-                                                goto err;
-                                                }
-                                if (!BUF_MEM_grow_clean(b,len+want))
-                                        {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                                        goto err;
-                                        }
+                                }
-                                while (want > 0)
+                                if (!BUF_MEM_grow_clean(b, len + want)) {
-                                        {
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
-                                        i=BIO_read(in,&(b->data[len]),want);
+                                        goto err;
-                                        if (i <= 0)
+                                }
-                                                {
+                                while (want > 0) {
+                                        i = BIO_read(in, &(b->data[len]), want);
+                                        if (i <= 0) {
                                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
                                                    ASN1_R_NOT_ENOUGH_DATA);
                                                goto err;
-                                                }
+                                        }
                                        /* This can't overflow because
                                         * |len+want| didn't overflow. */
-                                        len+=i;
+                                        len += i;
-                                        want-=i;
+                                        want -= i;
-                                        }
                                }
-                        if (off + c.slen < off)
+                        }
-                                {
+                        if (off + c.slen < off) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
                                goto err;
-                                }
-                        off+=c.slen;
-                        if (eos <= 0)
-                                {
-                                break;
-                                }
-                        else
-                                want=HEADER_SIZE;
                        }
+                        off += c.slen;
+                        if (eos <= 0) {
+                                break;
+                        } else
+                                want = HEADER_SIZE;
                }
+        }
-        if (off > INT_MAX)
+        if (off > INT_MAX) {
-                {
+                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
-                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
                goto err;
-                }
+        }
        *pb = b;
        return off;
 err:
-        if (b != NULL) BUF_MEM_free(b);
+        if (b != NULL)
+                BUF_MEM_free(b);
        return -1;
-        }
+}