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

openssl/crypto/rsa/rsa_asn1.c

 /* rsa_asn1.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2000-2005 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ skipping 38 matching lines @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
 
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/asn1t.h>
 
-static ASN1_METHOD method={
-        (I2D_OF(void))     i2d_RSAPrivateKey,
-        (D2I_OF(void))     d2i_RSAPrivateKey,
-        (void *(*)(void))  RSA_new,
-        (void (*)(void *)) RSA_free};
-
-ASN1_METHOD *RSAPrivateKey_asn1_meth(void)
-        {
-        return(&method);
-        }
-
 /* Override the default free and new methods */
-static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
+static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
+                                                                void *exarg)
 {
         if(operation == ASN1_OP_NEW_PRE) {
                 *pval = (ASN1_VALUE *)RSA_new();
                 if(*pval) return 2;
                 return 0;
         } else if(operation == ASN1_OP_FREE_PRE) {
                 RSA_free((RSA *)*pval);
                 *pval = NULL;
                 return 2;
         }
@@ skipping 24 matching lines @@
 
 RSA *RSAPublicKey_dup(RSA *rsa)
         {
         return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa);
         }
 
 RSA *RSAPrivateKey_dup(RSA *rsa)
         {
         return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa);
         }