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

openssl/crypto/engine/eng_int.h

 /* crypto/engine/eng_int.h */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 1999-2001 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 109 matching lines @@
 int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
                 ENGINE *e, const int *nids, int num_nids, int setdefault);
 void engine_table_unregister(ENGINE_TABLE **table, ENGINE *e);
 void engine_table_cleanup(ENGINE_TABLE **table);
 #ifndef ENGINE_TABLE_DEBUG
 ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);
 #else
 ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f, int l);
 #define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)
 #endif
+typedef void (engine_table_doall_cb)(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg);
+void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb, void *arg);
 
 /* Internal versions of API functions that have control over locking. These are
  * used between C files when functionality needs to be shared but the caller may
  * already be controlling of the CRYPTO_LOCK_ENGINE lock. */
 int engine_unlocked_init(ENGINE *e);
 int engine_unlocked_finish(ENGINE *e, int unlock_for_handlers);
 int engine_free_util(ENGINE *e, int locked);
 
 /* This function will reset all "set"able values in an ENGINE to NULL. This
  * won't touch reference counts or ex_data, but is equivalent to calling all the
  * ENGINE_set_***() functions with a NULL value. */
 void engine_set_all_null(ENGINE *e);
 
 /* NB: Bitwise OR-able values for the "flags" variable in ENGINE are now exposed
  * in engine.h. */
 
+/* Free up dynamically allocated public key methods associated with ENGINE */
+
+void engine_pkey_meths_free(ENGINE *e);
+void engine_pkey_asn1_meths_free(ENGINE *e);
+
 /* This is a structure for storing implementations of various crypto
  * algorithms and functions. */
 struct engine_st
         {
         const char *id;
         const char *name;
         const RSA_METHOD *rsa_meth;
         const DSA_METHOD *dsa_meth;
         const DH_METHOD *dh_meth;
         const ECDH_METHOD *ecdh_meth;
         const ECDSA_METHOD *ecdsa_meth;
         const RAND_METHOD *rand_meth;
         const STORE_METHOD *store_meth;
         /* Cipher handling is via this callback */
         ENGINE_CIPHERS_PTR ciphers;
         /* Digest handling is via this callback */
         ENGINE_DIGESTS_PTR digests;
-
+        /* Public key handling via this callback */
+        ENGINE_PKEY_METHS_PTR pkey_meths;
+        /* ASN1 public key handling via this callback */
+        ENGINE_PKEY_ASN1_METHS_PTR pkey_asn1_meths;
 
         ENGINE_GEN_INT_FUNC_PTR destroy;
 
         ENGINE_GEN_INT_FUNC_PTR init;
         ENGINE_GEN_INT_FUNC_PTR finish;
         ENGINE_CTRL_FUNC_PTR ctrl;
         ENGINE_LOAD_KEY_PTR load_privkey;
         ENGINE_LOAD_KEY_PTR load_pubkey;
 
         ENGINE_SSL_CLIENT_CERT_PTR load_ssl_client_cert;
@@ skipping 13 matching lines @@
         /* Used to maintain the linked-list of engines. */
         struct engine_st *prev;
         struct engine_st *next;
         };
 
 #ifdef  __cplusplus
 }
 #endif
 
 #endif /* HEADER_ENGINE_INT_H */