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

openssl/crypto/engine/eng_fat.c

 /* crypto/engine/eng_fat.c */
 /* ====================================================================
  * 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
@@ skipping 71 matching lines @@
 #ifndef OPENSSL_NO_ECDH
         if((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e))
                 return 0;
 #endif
 #ifndef OPENSSL_NO_ECDSA
         if((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
                 return 0;
 #endif
         if((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
                 return 0;
+        if((flags & ENGINE_METHOD_PKEY_METHS)
+                                && !ENGINE_set_default_pkey_meths(e))
+                return 0;
+        if((flags & ENGINE_METHOD_PKEY_ASN1_METHS)
+                                && !ENGINE_set_default_pkey_asn1_meths(e))
+                return 0;
         return 1;
         }
 
 /* Set default algorithms using a string */
 
 static int int_def_cb(const char *alg, int len, void *arg)
         {
         unsigned int *pflags = arg;
         if (!strncmp(alg, "ALL", len))
                 *pflags |= ENGINE_METHOD_ALL;
         else if (!strncmp(alg, "RSA", len))
                 *pflags |= ENGINE_METHOD_RSA;
         else if (!strncmp(alg, "DSA", len))
                 *pflags |= ENGINE_METHOD_DSA;
         else if (!strncmp(alg, "ECDH", len))
                 *pflags |= ENGINE_METHOD_ECDH;
         else if (!strncmp(alg, "ECDSA", len))
                 *pflags |= ENGINE_METHOD_ECDSA;
         else if (!strncmp(alg, "DH", len))
                 *pflags |= ENGINE_METHOD_DH;
         else if (!strncmp(alg, "RAND", len))
                 *pflags |= ENGINE_METHOD_RAND;
         else if (!strncmp(alg, "CIPHERS", len))
                 *pflags |= ENGINE_METHOD_CIPHERS;
         else if (!strncmp(alg, "DIGESTS", len))
                 *pflags |= ENGINE_METHOD_DIGESTS;
+        else if (!strncmp(alg, "PKEY", len))
+                *pflags |=
+                        ENGINE_METHOD_PKEY_METHS|ENGINE_METHOD_PKEY_ASN1_METHS;
+        else if (!strncmp(alg, "PKEY_CRYPTO", len))
+                *pflags |= ENGINE_METHOD_PKEY_METHS;
+        else if (!strncmp(alg, "PKEY_ASN1", len))
+                *pflags |= ENGINE_METHOD_PKEY_ASN1_METHS;
         else
                 return 0;
         return 1;
         }
 
 
 int ENGINE_set_default_string(ENGINE *e, const char *def_list)
         {
         unsigned int flags = 0;
         if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags))
@@ skipping 19 matching lines @@
 #ifndef OPENSSL_NO_DH
         ENGINE_register_DH(e);
 #endif
 #ifndef OPENSSL_NO_ECDH
         ENGINE_register_ECDH(e);
 #endif
 #ifndef OPENSSL_NO_ECDSA
         ENGINE_register_ECDSA(e);
 #endif
         ENGINE_register_RAND(e);
+        ENGINE_register_pkey_meths(e);
         return 1;
         }
 
 int ENGINE_register_all_complete(void)
         {
         ENGINE *e;
 
         for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
                 ENGINE_register_complete(e);
         return 1;
         }