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

openssl/crypto/asn1/asn1_gen.c

 /* asn1_gen.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2002.
  */
 /* ====================================================================
  * Copyright (c) 2002 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 229 matching lines @@
                 {
                 ASN1_put_object(&p, etmp->exp_constructed, etmp->exp_len,
                                         etmp->exp_tag, etmp->exp_class);
                 if (etmp->exp_pad)
                         *p++ = 0;
                 }
 
         /* If IMPLICIT, output tag */
 
         if (asn1_tags.imp_tag != -1)
+                {
+                if (asn1_tags.imp_class == V_ASN1_UNIVERSAL 
+                    && (asn1_tags.imp_tag == V_ASN1_SEQUENCE
+                     || asn1_tags.imp_tag == V_ASN1_SET) )
+                        hdr_constructed = V_ASN1_CONSTRUCTED;
                 ASN1_put_object(&p, hdr_constructed, hdr_len,
                                         asn1_tags.imp_tag, asn1_tags.imp_class);
+                }
 
         /* Copy across original encoding */
         memcpy(p, cpy_start, cpy_len);
 
         cp = new_der;
 
         /* Obtain new ASN1_TYPE structure */
         ret = d2i_ASN1_TYPE(NULL, &cp, len);
 
         err:
@@ skipping 172 matching lines @@
                 *pclass = V_ASN1_CONTEXT_SPECIFIC;
 
         return 1;
 
         }
 
 /* Handle multiple types: SET and SEQUENCE */
 
 static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf)
         {
-        ASN1_TYPE *ret = NULL, *typ = NULL;
+        ASN1_TYPE *ret = NULL;
         STACK_OF(ASN1_TYPE) *sk = NULL;
         STACK_OF(CONF_VALUE) *sect = NULL;
-        unsigned char *der = NULL, *p;
+        unsigned char *der = NULL;
         int derlen;
-        int i, is_set;
+        int i;
         sk = sk_ASN1_TYPE_new_null();
         if (!sk)
                 goto bad;
         if (section)
                 {
                 if (!cnf)
                         goto bad;
                 sect = X509V3_get_section(cnf, (char *)section);
                 if (!sect)
                         goto bad;
                 for (i = 0; i < sk_CONF_VALUE_num(sect); i++)
                         {
-                        typ = ASN1_generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf);
+                        ASN1_TYPE *typ = ASN1_generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf);
                         if (!typ)
                                 goto bad;
                         if (!sk_ASN1_TYPE_push(sk, typ))
                                 goto bad;
-                        typ = NULL;
                         }
                 }
 
         /* Now we has a STACK of the components, convert to the correct form */
 
         if (utype == V_ASN1_SET)
-                is_set = 1;
+                derlen = i2d_ASN1_SET_ANY(sk, &der);
         else
-                is_set = 0;
+                derlen = i2d_ASN1_SEQUENCE_ANY(sk, &der);
 
-
-        derlen = i2d_ASN1_SET_OF_ASN1_TYPE(sk, NULL, i2d_ASN1_TYPE, utype,
-                                           V_ASN1_UNIVERSAL, is_set);
-        der = OPENSSL_malloc(derlen);
-        if (!der)
+        if (derlen < 0)
                 goto bad;
-        p = der;
-        i2d_ASN1_SET_OF_ASN1_TYPE(sk, &p, i2d_ASN1_TYPE, utype,
-                                  V_ASN1_UNIVERSAL, is_set);
 
         if (!(ret = ASN1_TYPE_new()))
                 goto bad;
 
         if (!(ret->value.asn1_string = ASN1_STRING_type_new(utype)))
                 goto bad;
 
         ret->type = utype;
 
         ret->value.asn1_string->data = der;
         ret->value.asn1_string->length = derlen;
 
         der = NULL;
 
         bad:
 
         if (der)
                 OPENSSL_free(der);
 
         if (sk)
                 sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
-        if (typ)
-                ASN1_TYPE_free(typ);
         if (sect)
                 X509V3_section_free(cnf, sect);
 
         return ret;
         }
 
 static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class, int exp_constructed, int exp_pad, int imp_ok)
         {
         tag_exp_type *exp_tmp;
         /* Can only have IMPLICIT if permitted */
@@ skipping 29 matching lines @@
         exp_tmp->exp_constructed = exp_constructed;
         exp_tmp->exp_pad = exp_pad;
 
         return 1;
         }
 
 
 static int asn1_str2tag(const char *tagstr, int len)
         {
         unsigned int i;
-        static struct tag_name_st *tntmp, tnst [] = {
+        static const struct tag_name_st *tntmp, tnst [] = {
                 ASN1_GEN_STR("BOOL", V_ASN1_BOOLEAN),
                 ASN1_GEN_STR("BOOLEAN", V_ASN1_BOOLEAN),
                 ASN1_GEN_STR("NULL", V_ASN1_NULL),
                 ASN1_GEN_STR("INT", V_ASN1_INTEGER),
                 ASN1_GEN_STR("INTEGER", V_ASN1_INTEGER),
                 ASN1_GEN_STR("ENUM", V_ASN1_ENUMERATED),
                 ASN1_GEN_STR("ENUMERATED", V_ASN1_ENUMERATED),
                 ASN1_GEN_STR("OID", V_ASN1_OBJECT),
                 ASN1_GEN_STR("OBJECT", V_ASN1_OBJECT),
                 ASN1_GEN_STR("UTCTIME", V_ASN1_UTCTIME),
@@ skipping 14 matching lines @@
                 ASN1_GEN_STR("BMPSTRING", V_ASN1_BMPSTRING),
                 ASN1_GEN_STR("VISIBLESTRING", V_ASN1_VISIBLESTRING),
                 ASN1_GEN_STR("VISIBLE", V_ASN1_VISIBLESTRING),
                 ASN1_GEN_STR("PRINTABLESTRING", V_ASN1_PRINTABLESTRING),
                 ASN1_GEN_STR("PRINTABLE", V_ASN1_PRINTABLESTRING),
                 ASN1_GEN_STR("T61", V_ASN1_T61STRING),
                 ASN1_GEN_STR("T61STRING", V_ASN1_T61STRING),
                 ASN1_GEN_STR("TELETEXSTRING", V_ASN1_T61STRING),
                 ASN1_GEN_STR("GeneralString", V_ASN1_GENERALSTRING),
                 ASN1_GEN_STR("GENSTR", V_ASN1_GENERALSTRING),
+                ASN1_GEN_STR("NUMERIC", V_ASN1_NUMERICSTRING),
+                ASN1_GEN_STR("NUMERICSTRING", V_ASN1_NUMERICSTRING),
 
                 /* Special cases */
                 ASN1_GEN_STR("SEQUENCE", V_ASN1_SEQUENCE),
                 ASN1_GEN_STR("SEQ", V_ASN1_SEQUENCE),
                 ASN1_GEN_STR("SET", V_ASN1_SET),
                 /* type modifiers */
                 /* Explicit tag */
                 ASN1_GEN_STR("EXP", ASN1_GEN_FLAG_EXP),
                 ASN1_GEN_STR("EXPLICIT", ASN1_GEN_FLAG_EXP),
                 /* Implicit tag */
@@ skipping 125 matching lines @@
                 break;
 
                 case V_ASN1_BMPSTRING:
                 case V_ASN1_PRINTABLESTRING:
                 case V_ASN1_IA5STRING:
                 case V_ASN1_T61STRING:
                 case V_ASN1_UTF8STRING:
                 case V_ASN1_VISIBLESTRING:
                 case V_ASN1_UNIVERSALSTRING:
                 case V_ASN1_GENERALSTRING:
+                case V_ASN1_NUMERICSTRING:
 
                 if (format == ASN1_GEN_FORMAT_ASCII)
                         format = MBSTRING_ASC;
                 else if (format == ASN1_GEN_FORMAT_UTF8)
                         format = MBSTRING_UTF8;
                 else
                         {
                         ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_FORMAT);
                         goto bad_form;
                         }
@@ skipping 97 matching lines @@
                 return 0;
                 }
         if (!ASN1_BIT_STRING_set_bit(bitstr, bitnum, 1))
                 {
                 ASN1err(ASN1_F_BITSTR_CB, ERR_R_MALLOC_FAILURE);
                 return 0;
                 }
         return 1;
         }