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

openssl/crypto/asn1/asn1_lib.c

 /* crypto/asn1/asn1_lib.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 322 matching lines @@
                 {
                 c->error=ERR_R_ASN1_LENGTH_MISMATCH;
                 return(0);
                 }
         if (c->inf == (1|V_ASN1_CONSTRUCTED))
                 c->slen= *length+ *(c->pp)-c->p;
         c->eos=0;
         return(1);
         }
 
-ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *str)
+int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str)
+        {
+        if (str == NULL)
+                return 0;
+        dst->type = str->type;
+        if (!ASN1_STRING_set(dst,str->data,str->length))
+                return 0;
+        dst->flags = str->flags;
+        return 1;
+        }
+
+ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *str)
         {
         ASN1_STRING *ret;
-
-        if (str == NULL) return(NULL);
-        if ((ret=ASN1_STRING_type_new(str->type)) == NULL)
-                return(NULL);
-        if (!ASN1_STRING_set(ret,str->data,str->length))
+        if (!str)
+                 return NULL;
+        ret=ASN1_STRING_new();
+        if (!ret)
+                return NULL;
+        if (!ASN1_STRING_copy(ret,str))
                 {
                 ASN1_STRING_free(ret);
-                return(NULL);
+                return NULL;
                 }
-        ret->flags = str->flags;
-        return(ret);
+        return ret;
         }
 
 int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
         {
         unsigned char *c;
         const char *data=_data;
 
         if (len < 0)
                 {
                 if (data == NULL)
@@ skipping 53 matching lines @@
         ret->length=0;
         ret->type=type;
         ret->data=NULL;
         ret->flags=0;
         return(ret);
         }
 
 void ASN1_STRING_free(ASN1_STRING *a)
         {
         if (a == NULL) return;
-        if (a->data != NULL) OPENSSL_free(a->data);
+        if (a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+                OPENSSL_free(a->data);
         OPENSSL_free(a);
         }
 
-int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
+int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
         {
         int i;
 
         i=(a->length-b->length);
         if (i == 0)
                 {
                 i=memcmp(a->data,b->data,a->length);
                 if (i == 0)
                         return(a->type-b->type);
                 else
                         return(i);
                 }
         else
                 return(i);
         }
 
 void asn1_add_error(const unsigned char *address, int offset)
         {
         char buf1[DECIMAL_SIZE(address)+1],buf2[DECIMAL_SIZE(offset)+1];
 
         BIO_snprintf(buf1,sizeof buf1,"%lu",(unsigned long)address);
         BIO_snprintf(buf2,sizeof buf2,"%d",offset);
         ERR_add_error_data(4,"address=",buf1," offset=",buf2);
         }
 
-int ASN1_STRING_length(ASN1_STRING *x)
+int ASN1_STRING_length(const ASN1_STRING *x)
 { return M_ASN1_STRING_length(x); }
 
 void ASN1_STRING_length_set(ASN1_STRING *x, int len)
 { M_ASN1_STRING_length_set(x, len); return; }
 
 int ASN1_STRING_type(ASN1_STRING *x)
 { return M_ASN1_STRING_type(x); }
 
 unsigned char * ASN1_STRING_data(ASN1_STRING *x)
 { return M_ASN1_STRING_data(x); }