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

openssl/ssl/ssl_cert.c

 /*! \file ssl/ssl_cert.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 38 matching lines @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2007 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 120 matching lines @@
                 return(NULL);
                 }
 
         memset(ret, 0, sizeof(CERT));
 
         ret->key = &ret->pkeys[cert->key - &cert->pkeys[0]];
         /* or ret->key = ret->pkeys + (cert->key - cert->pkeys),
          * if you find that more readable */
 
         ret->valid = cert->valid;
-        ret->mask = cert->mask;
-        ret->export_mask = cert->export_mask;
+        ret->mask_k = cert->mask_k;
+        ret->mask_a = cert->mask_a;
+        ret->export_mask_k = cert->export_mask_k;
+        ret->export_mask_a = cert->export_mask_a;
 
 #ifndef OPENSSL_NO_RSA
         if (cert->rsa_tmp != NULL)
                 {
                 RSA_up_ref(cert->rsa_tmp);
                 ret->rsa_tmp = cert->rsa_tmp;
                 }
         ret->rsa_tmp_cb = cert->rsa_tmp_cb;
 #endif
 
@@ skipping 611 matching lines @@
                 }
 
         ret = 1;
 
 err:
         if (d) OPENSSL_DIR_end(&d);
         CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
         return ret;
         }