1 files changed, 85 insertions, 74 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_enc.c b/src/lib/libcrypto/asn1/tasn_enc.c
index c9131cd9ca..f5fc8820f6 100644
--- a/src/lib/libcrypto/asn1/tasn_enc.c
+++ b/src/lib/libcrypto/asn1/tasn_enc.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -56,7 +56,6 @@
  *
  */
 
-
 #include <stddef.h>
 #include <string.h>
 #include "cryptlib.h"
@@ -65,34 +64,32 @@
 #include <openssl/objects.h>
 
 static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
-                                        const ASN1_ITEM *it,
-                                        int tag, int aclass);
+    const ASN1_ITEM *it, int tag, int aclass);
 static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out,
-                                        int skcontlen, const ASN1_ITEM *item,
-                                        int do_sort, int iclass);
+    int skcontlen, const ASN1_ITEM *item, int do_sort, int iclass);
 static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                                        const ASN1_TEMPLATE *tt,
-                                        int tag, int aclass);
+    const ASN1_TEMPLATE *tt, int tag, int aclass);
 static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out,
-                                        const ASN1_ITEM *it, int flags);
+    const ASN1_ITEM *it, int flags);
 
 /* Top level i2d equivalents: the 'ndef' variant instructs the encoder
  * to use indefinite length constructed encoding, where appropriate
  */
 
-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out,
-                                                const ASN1_ITEM *it)
+int
+ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it)
 {
         return asn1_item_flags_i2d(val, out, it, ASN1_TFLG_NDEF);
 }
 
-int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it)
+int
+ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it)
 {
         return asn1_item_flags_i2d(val, out, it, 0);
 }
 
 /* Encode an ASN1 item, this is use by the
- * standard 'i2d' function. 'out' points to 
+ * standard 'i2d' function. 'out' points to
  * a buffer to output the data to.
  *
  * The new i2d has one additional feature. If the output
@@ -100,8 +97,9 @@ int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it)
  * allocated and populated with the encoding.
  */
 
-static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out,
-                                        const ASN1_ITEM *it, int flags)
+static int
+asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it,
+    int flags)
 {
         if (out && !*out) {
                 unsigned char *p, *buf;
@@ -126,8 +124,9 @@ static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out,
  * used in external types.
  */
 
-int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                        const ASN1_ITEM *it, int tag, int aclass)
+int
+ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it,
+    int tag, int aclass)
 {
         const ASN1_TEMPLATE *tt = NULL;
         unsigned char *p = NULL;
@@ -141,14 +140,14 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 return 0;
 
         if (aux && aux->asn1_cb)
-                 asn1_cb = aux->asn1_cb;
+                asn1_cb = aux->asn1_cb;
 
-        switch(it->itype) {
+        switch (it->itype) {
 
         case ASN1_ITYPE_PRIMITIVE:
                 if (it->templates)
                         return asn1_template_ex_i2d(pval, out, it->templates,
-                                                                tag, aclass);
+                            tag, aclass);
                 return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
                 break;
 
@@ -157,7 +156,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
 
         case ASN1_ITYPE_CHOICE:
                 if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL))
-                                return 0;
+                        return 0;
                 i = asn1_get_choice_selector(pval, it);
                 if ((i >= 0) && (i < it->tcount)) {
                         ASN1_VALUE **pchval;
@@ -165,11 +164,11 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                         chtt = it->templates + i;
                         pchval = asn1_get_field_ptr(pval, chtt);
                         return asn1_template_ex_i2d(pchval, out, chtt,
-                                                                -1, aclass);
+                            -1, aclass);
                 }
                 /* Fixme: error condition if selector out of range */
                 if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it, NULL))
-                                return 0;
+                        return 0;
                 break;
 
         case ASN1_ITYPE_EXTERN:
@@ -189,10 +188,11 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 if (out && (tag != -1))
                         *p = aclass | tag | (*p & V_ASN1_CONSTRUCTED);
                 return i;
-                
+
         case ASN1_ITYPE_NDEF_SEQUENCE:
                 /* Use indefinite length constructed if requested */
-                if (aclass & ASN1_TFLG_NDEF) ndef = 2;
+                if (aclass & ASN1_TFLG_NDEF)
+                        ndef = 2;
                 /* fall through */
 
         case ASN1_ITYPE_SEQUENCE:
@@ -209,11 +209,11 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 if (tag == -1) {
                         tag = V_ASN1_SEQUENCE;
                         /* Retain any other flags in aclass */
-                        aclass = (aclass & ~ASN1_TFLG_TAG_CLASS)
-                                        | V_ASN1_UNIVERSAL;
+                        aclass = (aclass & ~ASN1_TFLG_TAG_CLASS) |
+                            V_ASN1_UNIVERSAL;
                 }
                 if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL))
-                                return 0;
+                        return 0;
                 /* First work out sequence content length */
                 for (i = 0, tt = it->templates; i < it->tcount; tt++, i++) {
                         const ASN1_TEMPLATE *seqtt;
@@ -224,7 +224,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                         pseqval = asn1_get_field_ptr(pval, seqtt);
                         /* FIXME: check for errors in enhanced version */
                         seqcontlen += asn1_template_ex_i2d(pseqval, NULL, seqtt,
-                                                                -1, aclass);
+                            -1, aclass);
                 }
 
                 seqlen = ASN1_object_size(ndef, seqcontlen, tag);
@@ -245,24 +245,26 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 if (ndef == 2)
                         ASN1_put_eoc(out);
                 if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it, NULL))
-                                return 0;
+                        return 0;
                 return seqlen;
 
-                default:
+        default:
                 return 0;
 
         }
         return 0;
 }
 
-int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
-                                                        const ASN1_TEMPLATE *tt)
+int
+ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
+    const ASN1_TEMPLATE *tt)
 {
         return asn1_template_ex_i2d(pval, out, tt, -1, 0);
 }
 
-static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                                const ASN1_TEMPLATE *tt, int tag, int iclass)
+static int
+asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
+    const ASN1_TEMPLATE *tt, int tag, int iclass)
 {
         int i, ret, flags, ttag, tclass, ndef;
         flags = tt->flags;
@@ -288,7 +290,7 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 ttag = -1;
                 tclass = 0;
         }
-        /* 
+        /*
          * Remove any class mask from iflag.
          */
         iclass &= ~ASN1_TFLG_TAG_CLASS;
@@ -301,7 +303,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
         /* if template and arguments require ndef, use it */
         if ((flags & ASN1_TFLG_NDEF) && (iclass & ASN1_TFLG_NDEF))
                 ndef = 2;
-        else ndef = 1;
+        else
+                ndef = 1;
 
         if (flags & ASN1_TFLG_SK_MASK) {
                 /* SET OF, SEQUENCE OF */
@@ -318,8 +321,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                         /* 2 means we reorder */
                         if (flags & ASN1_TFLG_SEQUENCE_OF)
                                 isset = 2;
-                }
-                else isset = 0;
+                } else
+                        isset = 0;
 
                 /* Work out inner tag value: if EXPLICIT
                  * or no tagging use underlying type.
@@ -331,7 +334,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                         skaclass = V_ASN1_UNIVERSAL;
                         if (isset)
                                 sktag = V_ASN1_SET;
-                        else sktag = V_ASN1_SEQUENCE;
+                        else
+                                sktag = V_ASN1_SEQUENCE;
                 }
 
                 /* Determine total length of items */
@@ -339,14 +343,14 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 for (i = 0; i < sk_ASN1_VALUE_num(sk); i++) {
                         skitem = sk_ASN1_VALUE_value(sk, i);
                         skcontlen += ASN1_item_ex_i2d(&skitem, NULL,
-                                                ASN1_ITEM_ptr(tt->item),
-                                                        -1, iclass);
+                            ASN1_ITEM_ptr(tt->item), -1, iclass);
                 }
                 sklen = ASN1_object_size(ndef, skcontlen, sktag);
                 /* If EXPLICIT need length of surrounding tag */
                 if (flags & ASN1_TFLG_EXPTAG)
                         ret = ASN1_object_size(ndef, sklen, ttag);
-                else ret = sklen;
+                else
+                        ret = sklen;
 
                 if (!out)
                         return ret;
@@ -359,7 +363,7 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 ASN1_put_object(out, ndef, skcontlen, sktag, skaclass);
                 /* And the stuff itself */
                 asn1_set_seq_out(sk, out, skcontlen, ASN1_ITEM_ptr(tt->item),
-                                                                isset, iclass);
+                    isset, iclass);
                 if (ndef == 2) {
                         ASN1_put_eoc(out);
                         if (flags & ASN1_TFLG_EXPTAG)
@@ -373,7 +377,7 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                 /* EXPLICIT tagging */
                 /* Find length of tagged item */
                 i = ASN1_item_ex_i2d(pval, NULL, ASN1_ITEM_ptr(tt->item),
-                                                                -1, iclass);
+                    -1, iclass);
                 if (!i)
                         return 0;
                 /* Find length of EXPLICIT tag */
@@ -382,7 +386,7 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
                         /* Output tag and item */
                         ASN1_put_object(out, ndef, i, ttag, tclass);
                         ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
-                                                                -1, iclass);
+                            -1, iclass);
                         if (ndef == 2)
                                 ASN1_put_eoc(out);
                 }
@@ -391,8 +395,7 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
 
         /* Either normal or IMPLICIT tagging: combine class and flags */
         return ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
-                                                ttag, tclass | iclass);
-
+            ttag, tclass | iclass);
 }
 
 /* Temporary structure used to hold DER encoding of items for SET OF */
@@ -403,10 +406,12 @@ typedef	struct {
         ASN1_VALUE *field;
 } DER_ENC;
 
-static int der_cmp(const void *a, const void *b)
+static int
+der_cmp(const void *a, const void *b)
 {
         const DER_ENC *d1 = a, *d2 = b;
         int cmplen, i;
+
         cmplen = (d1->length < d2->length) ? d1->length : d2->length;
         i = memcmp(d1->data, d2->data, cmplen);
         if (i)
@@ -416,22 +421,22 @@ static int der_cmp(const void *a, const void *b)
 
 /* Output the content octets of SET OF or SEQUENCE OF */
 
-static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out,
-                                        int skcontlen, const ASN1_ITEM *item,
-                                        int do_sort, int iclass)
+static int
+asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out, int skcontlen,
+    const ASN1_ITEM *item, int do_sort, int iclass)
 {
         int i;
         ASN1_VALUE *skitem;
         unsigned char *tmpdat = NULL, *p = NULL;
         DER_ENC *derlst = NULL, *tder;
-        if (do_sort)
-                 {
+
+        if (do_sort) {
                 /* Don't need to sort less than 2 items */
                 if (sk_ASN1_VALUE_num(sk) < 2)
                         do_sort = 0;
                 else {
-                        derlst = malloc(sk_ASN1_VALUE_num(sk)
-                                                * sizeof(*derlst));
+                        derlst = malloc(sk_ASN1_VALUE_num(sk) *
+                            sizeof(*derlst));
                         tmpdat = malloc(skcontlen);
                         if (!derlst || !tmpdat) {
                                 free(derlst);
@@ -460,7 +465,7 @@ static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out,
 
         /* Now sort them */
         qsort(derlst, sk_ASN1_VALUE_num(sk), sizeof(*derlst), der_cmp);
-        /* Output sorted DER encoding */        
+        /* Output sorted DER encoding */
         p = *out;
         for (i = 0, tder = derlst; i < sk_ASN1_VALUE_num(sk); i++, tder++) {
                 memcpy(p, tder->data, tder->length);
@@ -477,8 +482,9 @@ static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out,
         return 1;
 }
 
-static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
-                                const ASN1_ITEM *it, int tag, int aclass)
+static int
+asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
+    const ASN1_ITEM *it, int tag, int aclass)
 {
         int len;
         int utype;
@@ -500,12 +506,12 @@ static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
          * utype.
          */
         if ((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) ||
-           (utype == V_ASN1_OTHER))
+            (utype == V_ASN1_OTHER))
                 usetag = 0;
-        else usetag = 1;
+        else
+                usetag = 1;
 
         /* -1 means omit type */
-
         if (len == -1)
                 return 0;
 
@@ -516,7 +522,8 @@ static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
         }
 
         /* If not implicitly tagged get tag from underlying type */
-        if (tag == -1) tag = utype;
+        if (tag == -1)
+                tag = utype;
 
         /* Output tag+length followed by content octets */
         if (out) {
@@ -536,8 +543,9 @@ static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
 
 /* Produce content octets from a structure */
 
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
-                                const ASN1_ITEM *it)
+int
+asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
+    const ASN1_ITEM *it)
 {
         ASN1_BOOLEAN *tbool = NULL;
         ASN1_STRING *strtmp;
@@ -547,13 +555,16 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
         unsigned char c;
         int len;
         const ASN1_PRIMITIVE_FUNCS *pf;
+
         pf = it->funcs;
         if (pf && pf->prim_i2c)
                 return pf->prim_i2c(pval, cout, putype, it);
 
         /* Should type be omitted? */
-        if ((it->itype != ASN1_ITYPE_PRIMITIVE) || (it->utype != V_ASN1_BOOLEAN)) {
-                if (!*pval) return -1;
+        if ((it->itype != ASN1_ITYPE_PRIMITIVE) ||
+            (it->utype != V_ASN1_BOOLEAN)) {
+                if (!*pval)
+                        return -1;
         }
 
         if (it->itype == ASN1_ITYPE_MSTRING) {
@@ -568,10 +579,10 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
                 utype = typ->type;
                 *putype = utype;
                 pval = &typ->value.asn1_value;
-        }
-        else utype = *putype;
+        } else
+                utype = *putype;
 
-        switch(utype) {
+        switch (utype) {
         case V_ASN1_OBJECT:
                 otmp = (ASN1_OBJECT *)*pval;
                 cont = otmp->data;
@@ -601,7 +612,7 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
 
         case V_ASN1_BIT_STRING:
                 return i2c_ASN1_BIT_STRING((ASN1_BIT_STRING *)*pval,
-                                                        cout ? &cout : NULL);
+                    cout ? &cout : NULL);
                 break;
 
         case V_ASN1_INTEGER:
@@ -612,7 +623,7 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
                  * as ASN1_INTEGER
                  */
                 return i2c_ASN1_INTEGER((ASN1_INTEGER *)*pval,
-                                                        cout ? &cout : NULL);
+                    cout ? &cout : NULL);
                 break;
 
         case V_ASN1_OCTET_STRING:
@@ -635,8 +646,8 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
                 /* All based on ASN1_STRING and handled the same */
                 strtmp = (ASN1_STRING *)*pval;
                 /* Special handling for NDEF */
-                if ((it->size == ASN1_TFLG_NDEF)
-                        && (strtmp->flags & ASN1_STRING_FLAG_NDEF)) {
+                if ((it->size == ASN1_TFLG_NDEF) &&
+                    (strtmp->flags & ASN1_STRING_FLAG_NDEF)) {
                         if (cout) {
                                 strtmp->data = cout;
                                 strtmp->length = 0;