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

openssl/crypto/ec/ectest.c

 /* crypto/ec/ectest.c */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
 /* ====================================================================
  * Copyright (c) 1998-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 414 matching lines @@
         if (EC_GROUP_get_degree(group) != 192) ABORT;
         fprintf(stdout, " ok\n");
         
         fprintf(stdout, "verify group order ...");
         fflush(stdout);
         if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, ".");
         fflush(stdout);
-#if 0
         if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-#endif
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, " ok\n");
 
         if (!(P_192 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_192, group)) ABORT;
 
 
         /* Curve P-224 (FIPS PUB 186-2, App. 6) */
         
@@ skipping 23 matching lines @@
         if (EC_GROUP_get_degree(group) != 224) ABORT;
         fprintf(stdout, " ok\n");
         
         fprintf(stdout, "verify group order ...");
         fflush(stdout);
         if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, ".");
         fflush(stdout);
-#if 0
         if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-#endif
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, " ok\n");
 
         if (!(P_224 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_224, group)) ABORT;
 
 
         /* Curve P-256 (FIPS PUB 186-2, App. 6) */
         
@@ skipping 24 matching lines @@
         if (EC_GROUP_get_degree(group) != 256) ABORT;
         fprintf(stdout, " ok\n");
         
         fprintf(stdout, "verify group order ...");
         fflush(stdout);
         if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, ".");
         fflush(stdout);
-#if 0
         if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-#endif
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, " ok\n");
 
         if (!(P_256 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_256, group)) ABORT;
 
 
         /* Curve P-384 (FIPS PUB 186-2, App. 6) */
         
@@ skipping 29 matching lines @@
         if (EC_GROUP_get_degree(group) != 384) ABORT;
         fprintf(stdout, " ok\n");
         
         fprintf(stdout, "verify group order ...");
         fflush(stdout);
         if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, ".");
         fflush(stdout);
-#if 0
         if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-#endif
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, " ok\n");
 
         if (!(P_384 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_384, group)) ABORT;
 
 
         /* Curve P-521 (FIPS PUB 186-2, App. 6) */
         
@@ skipping 35 matching lines @@
         if (EC_GROUP_get_degree(group) != 521) ABORT;
         fprintf(stdout, " ok\n");
         
         fprintf(stdout, "verify group order ...");
         fflush(stdout);
         if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, ".");
         fflush(stdout);
-#if 0
         if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-#endif
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
         fprintf(stdout, " ok\n");
 
         if (!(P_521 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_521, group)) ABORT;
 
 
         /* more tests using the last curve */
 
@@ skipping 151 matching lines @@
         fprintf(stdout, "verify degree ..."); \
         if (EC_GROUP_get_degree(group) != _degree) ABORT; \
         fprintf(stdout, " ok\n"); \
         fprintf(stdout, "verify group order ..."); \
         fflush(stdout); \
         if (!EC_GROUP_get_order(group, z, ctx)) ABORT; \
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
         fprintf(stdout, "."); \
         fflush(stdout); \
-        /* if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; */ \
+        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; \
         if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
         if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
         fprintf(stdout, " ok\n"); \
         if (!(_variable = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT; \
         if (!EC_GROUP_copy(_variable, group)) ABORT;
 
 void char2_field_tests()
         {       
         BN_CTX *ctx = NULL;
         BIGNUM *p, *a, *b;
@@ skipping 506 matching lines @@
         puts("");
         char2_field_tests();
         /* test the internal curves */
         internal_curve_test();
 
 #ifndef OPENSSL_NO_ENGINE
         ENGINE_cleanup();
 #endif
         CRYPTO_cleanup_all_ex_data();
         ERR_free_strings();
-        ERR_remove_state(0);
+        ERR_remove_thread_state(NULL);
         CRYPTO_mem_leaks_fp(stderr);
         
         return 0;
         }
 #endif