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

openssl/crypto/x509/x509_vpm.c

 /* x509_vpm.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 56 matching lines @@
 
 /* X509_VERIFY_PARAM functions */
 
 static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
         {
         if (!param)
                 return;
         param->name = NULL;
         param->purpose = 0;
         param->trust = 0;
+        /*param->inh_flags = X509_VP_FLAG_DEFAULT;*/
         param->inh_flags = 0;
         param->flags = 0;
         param->depth = -1;
         if (param->policies)
                 {
                 sk_ASN1_OBJECT_pop_free(param->policies, ASN1_OBJECT_free);
                 param->policies = NULL;
                 }
         }
 
@@ skipping 234 matching lines @@
         "default",      /* X509 default parameters */
         0,              /* Check time */
         0,              /* internal flags */
         0,              /* flags */
         0,              /* purpose */
         0,              /* trust */
         100,            /* depth */
         NULL            /* policies */
         },
         {
-        "pkcs7",                        /* S/MIME signing parameters */
+        "pkcs7",                        /* S/MIME sign parameters */
         0,                              /* Check time */
         0,                              /* internal flags */
         0,                              /* flags */
         X509_PURPOSE_SMIME_SIGN,        /* purpose */
         X509_TRUST_EMAIL,               /* trust */
         -1,                             /* depth */
         NULL                            /* policies */
         },
         {
-        "smime_sign",                   /* S/MIME signing parameters */
+        "smime_sign",                   /* S/MIME sign parameters */
         0,                              /* Check time */
         0,                              /* internal flags */
         0,                              /* flags */
         X509_PURPOSE_SMIME_SIGN,        /* purpose */
         X509_TRUST_EMAIL,               /* trust */
         -1,                             /* depth */
         NULL                            /* policies */
         },
         {
         "ssl_client",                   /* SSL/TLS client parameters */
@@ skipping 11 matching lines @@
         0,                              /* internal flags */
         0,                              /* flags */
         X509_PURPOSE_SSL_SERVER,        /* purpose */
         X509_TRUST_SSL_SERVER,          /* trust */
         -1,                             /* depth */
         NULL                            /* policies */
         }};
 
 static STACK_OF(X509_VERIFY_PARAM) *param_table = NULL;
 
-static int table_cmp(const void *pa, const void *pb)
+static int table_cmp(const X509_VERIFY_PARAM *a, const X509_VERIFY_PARAM *b)
+
         {
-        const X509_VERIFY_PARAM *a = pa, *b = pb;
         return strcmp(a->name, b->name);
         }
 
+DECLARE_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM,
+                           table);
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM,
+                             table);
+
 static int param_cmp(const X509_VERIFY_PARAM * const *a,
                         const X509_VERIFY_PARAM * const *b)
         {
         return strcmp((*a)->name, (*b)->name);
         }
 
 int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param)
         {
         int idx;
         X509_VERIFY_PARAM *ptmp;
@@ skipping 15 matching lines @@
                 }
         if (!sk_X509_VERIFY_PARAM_push(param_table, param))
                 return 0;
         return 1;
         }
 
 const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name)
         {
         int idx;
         X509_VERIFY_PARAM pm;
+
         pm.name = (char *)name;
         if (param_table)
                 {
                 idx = sk_X509_VERIFY_PARAM_find(param_table, &pm);
                 if (idx != -1)
                         return sk_X509_VERIFY_PARAM_value(param_table, idx);
                 }
-        return (const X509_VERIFY_PARAM *) OBJ_bsearch((char *)&pm,
-                                (char *)&default_table,
-                                sizeof(default_table)/sizeof(X509_VERIFY_PARAM),
-                                sizeof(X509_VERIFY_PARAM),
-                                table_cmp);
+        return OBJ_bsearch_table(&pm, default_table,
+                           sizeof(default_table)/sizeof(X509_VERIFY_PARAM));
         }
 
 void X509_VERIFY_PARAM_table_cleanup(void)
         {
         if (param_table)
                 sk_X509_VERIFY_PARAM_pop_free(param_table,
                                                 X509_VERIFY_PARAM_free);
         param_table = NULL;
         }