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

openssl/crypto/x509v3/pcy_node.c

 /* pcy_node.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 74 matching lines @@
 
         idx = sk_X509_POLICY_NODE_find(nodes, &l);
         if (idx == -1)
                 return NULL;
 
         return sk_X509_POLICY_NODE_value(nodes, idx);
 
         }
 
 X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
+                                        const X509_POLICY_NODE *parent, 
                                         const ASN1_OBJECT *id)
         {
-        return tree_find_sk(level->nodes, id);
+        X509_POLICY_NODE *node;
+        int i;
+        for (i = 0; i < sk_X509_POLICY_NODE_num(level->nodes); i++)
+                {
+                node = sk_X509_POLICY_NODE_value(level->nodes, i);
+                if (node->parent == parent)
+                        {
+                        if (!OBJ_cmp(node->data->valid_policy, id))
+                                return node;
+                        }
+                }
+        return NULL;
         }
 
 X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
-                        X509_POLICY_DATA *data,
+                        const X509_POLICY_DATA *data,
                         X509_POLICY_NODE *parent,
                         X509_POLICY_TREE *tree)
         {
         X509_POLICY_NODE *node;
         node = OPENSSL_malloc(sizeof(X509_POLICY_NODE));
         if (!node)
                 return NULL;
         node->data = data;
         node->parent = parent;
         node->nchild = 0;
@@ skipping 36 matching lines @@
         policy_node_free(node);
         return 0;
 
         }
 
 void policy_node_free(X509_POLICY_NODE *node)
         {
         OPENSSL_free(node);
         }
 
+/* See if a policy node matches a policy OID. If mapping enabled look through
+ * expected policy set otherwise just valid policy.
+ */
 
+int policy_node_match(const X509_POLICY_LEVEL *lvl,
+                      const X509_POLICY_NODE *node, const ASN1_OBJECT *oid)
+        {
+        int i;
+        ASN1_OBJECT *policy_oid;
+        const X509_POLICY_DATA *x = node->data;
+
+        if (        (lvl->flags & X509_V_FLAG_INHIBIT_MAP)
+                || !(x->flags & POLICY_DATA_FLAG_MAP_MASK))
+                {
+                if (!OBJ_cmp(x->valid_policy, oid))
+                        return 1;
+                return 0;
+                }
+
+        for (i = 0; i < sk_ASN1_OBJECT_num(x->expected_policy_set); i++)
+                {
+                policy_oid = sk_ASN1_OBJECT_value(x->expected_policy_set, i);
+                if (!OBJ_cmp(policy_oid, oid))
+                        return 1;
+                }
+        return 0;
+
+        }