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

openssl/crypto/evp/evp_test.c

 /* Written by Ben Laurie, 2001 */
 /*
  * Copyright (c) 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 135 matching lines @@
     printf("Testing cipher %s%s\n",EVP_CIPHER_name(c),
            (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
     hexdump(stdout,"Key",key,kn);
     if(in)
         hexdump(stdout,"IV",iv,in);
     hexdump(stdout,"Plaintext",plaintext,pn);
     hexdump(stdout,"Ciphertext",ciphertext,cn);
     
     if(kn != c->key_len)
         {
-        fprintf(stderr,"Key length doesn't match, got %d expected %d\n",kn,
-                c->key_len);
+        fprintf(stderr,"Key length doesn't match, got %d expected %lu\n",kn,
+                (unsigned long)c->key_len);
         test1_exit(5);
         }
     EVP_CIPHER_CTX_init(&ctx);
     if (encdec != 0)
         {
         if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
             {
             fprintf(stderr,"EncryptInit failed\n");
             ERR_print_errors_fp(stderr);
             test1_exit(10);
@@ skipping 260 matching lines @@
             if (strstr(cipher, "SEED") == cipher)
                 {
                 fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
                 continue;
                 }
 #endif
             fprintf(stderr,"Can't find %s\n",cipher);
             EXIT(3);
             }
         }
+        fclose(f);
 
 #ifndef OPENSSL_NO_ENGINE
     ENGINE_cleanup();
 #endif
     EVP_cleanup();
     CRYPTO_cleanup_all_ex_data();
-    ERR_remove_state(0);
+    ERR_remove_thread_state(NULL);
     ERR_free_strings();
     CRYPTO_mem_leaks_fp(stderr);
 
     return 0;
     }