Upgrade chrome's OpenSSL to same version Android ships with.

openssl/crypto/asn1/tasn_enc.c

 /* tasn_enc.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000-2004 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 140 matching lines @@
                 if (it->templates)
                         return asn1_template_ex_i2d(pval, out, it->templates,
                                                                 tag, aclass);
                 return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
                 break;
 
                 case ASN1_ITYPE_MSTRING:
                 return asn1_i2d_ex_primitive(pval, out, it, -1, aclass);
 
                 case ASN1_ITYPE_CHOICE:
-                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it))
+                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL))
                                 return 0;
                 i = asn1_get_choice_selector(pval, it);
                 if ((i >= 0) && (i < it->tcount))
                         {
                         ASN1_VALUE **pchval;
                         const ASN1_TEMPLATE *chtt;
                         chtt = it->templates + i;
                         pchval = asn1_get_field_ptr(pval, chtt);
                         return asn1_template_ex_i2d(pchval, out, chtt,
                                                                 -1, aclass);
                         }
                 /* Fixme: error condition if selector out of range */
-                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it))
+                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it, NULL))
                                 return 0;
                 break;
 
                 case ASN1_ITYPE_EXTERN:
                 /* If new style i2d it does all the work */
                 ef = it->funcs;
                 return ef->asn1_ex_i2d(pval, out, it, tag, aclass);
 
                 case ASN1_ITYPE_COMPAT:
                 /* old style hackery... */
@@ skipping 24 matching lines @@
                 /* Otherwise carry on */
                 seqcontlen = 0;
                 /* If no IMPLICIT tagging set to SEQUENCE, UNIVERSAL */
                 if (tag == -1)
                         {
                         tag = V_ASN1_SEQUENCE;
                         /* Retain any other flags in aclass */
                         aclass = (aclass & ~ASN1_TFLG_TAG_CLASS)
                                         | V_ASN1_UNIVERSAL;
                         }
-                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it))
+                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_PRE, pval, it, NULL))
                                 return 0;
                 /* First work out sequence content length */
                 for (i = 0, tt = it->templates; i < it->tcount; tt++, i++)
                         {
                         const ASN1_TEMPLATE *seqtt;
                         ASN1_VALUE **pseqval;
                         seqtt = asn1_do_adb(pval, tt, 1);
                         if (!seqtt)
                                 return 0;
                         pseqval = asn1_get_field_ptr(pval, seqtt);
@@ skipping 13 matching lines @@
                         ASN1_VALUE **pseqval;
                         seqtt = asn1_do_adb(pval, tt, 1);
                         if (!seqtt)
                                 return 0;
                         pseqval = asn1_get_field_ptr(pval, seqtt);
                         /* FIXME: check for errors in enhanced version */
                         asn1_template_ex_i2d(pseqval, out, seqtt, -1, aclass);
                         }
                 if (ndef == 2)
                         ASN1_put_eoc(out);
-                if (asn1_cb  && !asn1_cb(ASN1_OP_I2D_POST, pval, it))
+                if (asn1_cb && !asn1_cb(ASN1_OP_I2D_POST, pval, it, NULL))
                                 return 0;
                 return seqlen;
 
                 default:
                 return 0;
 
                 }
         return 0;
         }
 
@@ skipping 298 matching lines @@
 
 /* Produce content octets from a structure */
 
 int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
                                 const ASN1_ITEM *it)
         {
         ASN1_BOOLEAN *tbool = NULL;
         ASN1_STRING *strtmp;
         ASN1_OBJECT *otmp;
         int utype;
-        unsigned char *cont, c;
+        const unsigned char *cont;
+        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))
                 {
@@ skipping 98 matching lines @@
                 cont = strtmp->data;
                 len = strtmp->length;
 
                 break;
 
                 }
         if (cout && len)
                 memcpy(cout, cont, len);
         return len;
         }