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

openssl/crypto/x509v3/v3_extku.c

 /* v3_extku.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 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 45 matching lines @@
  *
  */
 
 
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 
-static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
+static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
+                                    X509V3_CTX *ctx,
+                                    STACK_OF(CONF_VALUE) *nval);
+static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
                 void *eku, STACK_OF(CONF_VALUE) *extlist);
 
 const X509V3_EXT_METHOD v3_ext_ku = {
         NID_ext_key_usage, 0,
         ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
         0,0,0,0,
         0,0,
         i2v_EXTENDED_KEY_USAGE,
         v2i_EXTENDED_KEY_USAGE,
         0,0,
@@ skipping 11 matching lines @@
         0,0,
         NULL
 };
 
 ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) = 
         ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
 ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
 
 IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
 
-static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
-                void *a, STACK_OF(CONF_VALUE) *ext_list)
+static STACK_OF(CONF_VALUE) *
+  i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method, void *a,
+                         STACK_OF(CONF_VALUE) *ext_list)
 {
         EXTENDED_KEY_USAGE *eku = a;
         int i;
         ASN1_OBJECT *obj;
         char obj_tmp[80];
         for(i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
                 obj = sk_ASN1_OBJECT_value(eku, i);
                 i2t_ASN1_OBJECT(obj_tmp, 80, obj);
                 X509V3_add_value(NULL, obj_tmp, &ext_list);
         }
         return ext_list;
 }
 
-static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
+                                    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
         EXTENDED_KEY_USAGE *extku;
         char *extval;
         ASN1_OBJECT *objtmp;
         CONF_VALUE *val;
         int i;
 
         if(!(extku = sk_ASN1_OBJECT_new_null())) {
                 X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE,ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
 
         for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
                 val = sk_CONF_VALUE_value(nval, i);
                 if(val->value) extval = val->value;
                 else extval = val->name;
                 if(!(objtmp = OBJ_txt2obj(extval, 0))) {
                         sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
                         X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE,X509V3_R_INVALID_OBJECT_IDENTIFIER);
                         X509V3_conf_err(val);
                         return NULL;
                 }
                 sk_ASN1_OBJECT_push(extku, objtmp);
         }
         return extku;
 }