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

openssl/crypto/asn1/tasn_fre.c

 /* tasn_fre.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 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 92 matching lines @@
                         ASN1_primitive_free(pval, it);
                 break;
 
                 case ASN1_ITYPE_MSTRING:
                 ASN1_primitive_free(pval, it);
                 break;
 
                 case ASN1_ITYPE_CHOICE:
                 if (asn1_cb)
                         {
-                        i = asn1_cb(ASN1_OP_FREE_PRE, pval, it);
+                        i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
                         if (i == 2)
                                 return;
                         }
                 i = asn1_get_choice_selector(pval, it);
                 if ((i >= 0) && (i < it->tcount))
                         {
                         ASN1_VALUE **pchval;
                         tt = it->templates + i;
                         pchval = asn1_get_field_ptr(pval, tt);
                         ASN1_template_free(pchval, tt);
                         }
                 if (asn1_cb)
-                        asn1_cb(ASN1_OP_FREE_POST, pval, it);
+                        asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
                 if (!combine)
                         {
                         OPENSSL_free(*pval);
                         *pval = NULL;
                         }
                 break;
 
                 case ASN1_ITYPE_COMPAT:
                 cf = it->funcs;
                 if (cf && cf->asn1_free)
                         cf->asn1_free(*pval);
                 break;
 
                 case ASN1_ITYPE_EXTERN:
                 ef = it->funcs;
                 if (ef && ef->asn1_ex_free)
                         ef->asn1_ex_free(pval, it);
                 break;
 
                 case ASN1_ITYPE_NDEF_SEQUENCE:
                 case ASN1_ITYPE_SEQUENCE:
                 if (asn1_do_lock(pval, -1, it) > 0)
                         return;
                 if (asn1_cb)
                         {
-                        i = asn1_cb(ASN1_OP_FREE_PRE, pval, it);
+                        i = asn1_cb(ASN1_OP_FREE_PRE, pval, it, NULL);
                         if (i == 2)
                                 return;
                         }               
                 asn1_enc_free(pval, it);
                 /* If we free up as normal we will invalidate any
                  * ANY DEFINED BY field and we wont be able to 
                  * determine the type of the field it defines. So
                  * free up in reverse order.
                  */
                 tt = it->templates + it->tcount - 1;
                 for (i = 0; i < it->tcount; tt--, i++)
                         {
                         ASN1_VALUE **pseqval;
                         seqtt = asn1_do_adb(pval, tt, 0);
                         if (!seqtt)
                                 continue;
                         pseqval = asn1_get_field_ptr(pval, seqtt);
                         ASN1_template_free(pseqval, seqtt);
                         }
                 if (asn1_cb)
-                        asn1_cb(ASN1_OP_FREE_POST, pval, it);
+                        asn1_cb(ASN1_OP_FREE_POST, pval, it, NULL);
                 if (!combine)
                         {
                         OPENSSL_free(*pval);
                         *pval = NULL;
                         }
                 break;
                 }
         }
 
 void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
@@ skipping 73 matching lines @@
                 OPENSSL_free(*pval);
                 break;
 
                 default:
                 ASN1_STRING_free((ASN1_STRING *)*pval);
                 *pval = NULL;
                 break;
                 }
         *pval = NULL;
         }