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

openssl/crypto/x509v3/pcy_data.c

 /* pcy_data.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2004.
  */
 /* ====================================================================
  * Copyright (c) 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 64 matching lines @@
         OPENSSL_free(data);
         }
 
 /* Create a data based on an existing policy. If 'id' is NULL use the
  * oid in the policy, otherwise use 'id'. This behaviour covers the two
  * types of data in RFC3280: data with from a CertificatePolcies extension
  * and additional data with just the qualifiers of anyPolicy and ID from
  * another source.
  */
 
-X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, ASN1_OBJECT *id, int crit)
+X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
+                                        const ASN1_OBJECT *cid, int crit)
         {
         X509_POLICY_DATA *ret;
-        if (!policy && !id)
+        ASN1_OBJECT *id;
+        if (!policy && !cid)
                 return NULL;
-        if (id)
+        if (cid)
                 {
-                id = OBJ_dup(id);
+                id = OBJ_dup(cid);
                 if (!id)
                         return NULL;
                 }
+        else
+                id = NULL;
         ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
         if (!ret)
                 return NULL;
         ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
         if (!ret->expected_policy_set)
                 {
                 OPENSSL_free(ret);
                 if (id)
                         ASN1_OBJECT_free(id);
                 return NULL;
@@ skipping 16 matching lines @@
                 {
                 ret->qualifier_set = policy->qualifiers;
                 policy->qualifiers = NULL;
                 }
         else
                 ret->qualifier_set = NULL;
 
         return ret;
         }