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

openssl/crypto/asn1/asn1_par.c

 /* crypto/asn1/asn1_par.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ skipping 52 matching lines @@
 #include <openssl/asn1.h>
 
 static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed,
         int indent);
 static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
         int offset, int depth, int indent, int dump);
 static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed,
              int indent)
         {
         static const char fmt[]="%-18s";
-        static const char fmt2[]="%2d %-15s";
         char str[128];
-        const char *p,*p2=NULL;
+        const char *p;
 
         if (constructed & V_ASN1_CONSTRUCTED)
                 p="cons: ";
         else
                 p="prim: ";
         if (BIO_write(bp,p,6) < 6) goto err;
         BIO_indent(bp,indent,128);
 
         p=str;
         if ((xclass & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
                 BIO_snprintf(str,sizeof str,"priv [ %d ] ",tag);
         else if ((xclass & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
                 BIO_snprintf(str,sizeof str,"cont [ %d ]",tag);
         else if ((xclass & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
                 BIO_snprintf(str,sizeof str,"appl [ %d ]",tag);
         else if (tag > 30)
                 BIO_snprintf(str,sizeof str,"<ASN1 %d>",tag);
         else
                 p = ASN1_tag2str(tag);
 
-        if (p2 != NULL)
-                {
-                if (BIO_printf(bp,fmt2,tag,p2) <= 0) goto err;
-                }
-        else
-                {
-                if (BIO_printf(bp,fmt,p) <= 0) goto err;
-                }
+        if (BIO_printf(bp,fmt,p) <= 0)
+                goto err;
         return(1);
 err:
         return(0);
         }
 
 int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent)
         {
         return(asn1_parse2(bp,&pp,len,0,0,indent,0));
         }
 
@@ skipping 303 matching lines @@
         ret=1;
 end:
         if (o != NULL) ASN1_OBJECT_free(o);
         if (os != NULL) M_ASN1_OCTET_STRING_free(os);
         *pp=p;
         return(ret);
         }
 
 const char *ASN1_tag2str(int tag)
 {
-        static const char *tag2str[] = {
+        static const char * const tag2str[] = {
          "EOC", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING", /* 0-4 */
          "NULL", "OBJECT", "OBJECT DESCRIPTOR", "EXTERNAL", "REAL", /* 5-9 */
          "ENUMERATED", "<ASN1 11>", "UTF8STRING", "<ASN1 13>",      /* 10-13 */
         "<ASN1 14>", "<ASN1 15>", "SEQUENCE", "SET",                /* 15-17 */
         "NUMERICSTRING", "PRINTABLESTRING", "T61STRING",            /* 18-20 */
         "VIDEOTEXSTRING", "IA5STRING", "UTCTIME","GENERALIZEDTIME", /* 21-24 */
         "GRAPHICSTRING", "VISIBLESTRING", "GENERALSTRING",          /* 25-27 */
         "UNIVERSALSTRING", "<ASN1 29>", "BMPSTRING"                 /* 28-30 */
         };
 
         if((tag == V_ASN1_NEG_INTEGER) || (tag == V_ASN1_NEG_ENUMERATED))
                                                         tag &= ~0x100;
 
         if(tag < 0 || tag > 30) return "(unknown)";
         return tag2str[tag];
 }