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

openssl/engines/e_chil.c

 /* crypto/engine/e_chil.c -*- mode: C; c-file-style: "eay" -*- */
 /* Written by Richard Levitte (richard@levitte.org), Geoff Thorpe
  * (geoff@geoffthorpe.net) and Dr Stephen N Henson (steve@openssl.org)
  * 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
@@ skipping 209 matching lines @@
         hwcrhk_rand_bytes,
         NULL,
         NULL,
         hwcrhk_rand_bytes,
         hwcrhk_rand_status,
         };
 
 /* Constants used when creating the ENGINE */
 static const char *engine_hwcrhk_id = "chil";
 static const char *engine_hwcrhk_name = "CHIL hardware engine support";
-
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE 
 /* Compatibility hack, the dynamic library uses this form in the path */
 static const char *engine_hwcrhk_id_alt = "ncipher";
 #endif
 
 /* Internal stuff for HWCryptoHook */
 
 /* Some structures needed for proper use of thread locks */
 /* hwcryptohook.h has some typedefs that turn struct HWCryptoHook_MutexValue
    into HWCryptoHook_Mutex */
@@ skipping 594 matching lines @@
         res = EVP_PKEY_new();
         EVP_PKEY_assign_RSA(res, rtmp);
 #endif
 
         if (!res)
                 HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
                         HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED);
 
         return res;
  err:
-        if (res)
-                EVP_PKEY_free(res);
 #ifndef OPENSSL_NO_RSA
         if (rtmp)
                 RSA_free(rtmp);
 #endif
         return NULL;
         }
 
 static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
         UI_METHOD *ui_method, void *callback_data)
         {
@@ skipping 216 matching lines @@
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return hwcrhk_mod_exp(r, a, p, m, ctx);
         }
 
 static int hwcrhk_rsa_finish(RSA *rsa)
         {
         HWCryptoHook_RSAKeyHandle *hptr;
-        int ret;
+
         hptr = RSA_get_ex_data(rsa, hndidx_rsa);
         if (hptr)
                 {
-                ret = p_hwcrhk_RSAUnloadKey(*hptr, NULL);
+                p_hwcrhk_RSAUnloadKey(*hptr, NULL);
                 OPENSSL_free(hptr);
                 RSA_set_ex_data(rsa, hndidx_rsa, NULL);
                 }
         return 1;
         }
 
 #endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ skipping 252 matching lines @@
         if(!bind_helper(e))
                 return 0;
         return 1;
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
 #endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_CHIL */
 #endif /* !OPENSSL_NO_HW */