1 files changed, 12 insertions, 2 deletions

diff --git a/src/lib/libcrypto/ec/ectest.c b/src/lib/libcrypto/ec/ectest.c
index 7509cb9c7c..6148d553f9 100644
--- a/src/lib/libcrypto/ec/ectest.c
+++ b/src/lib/libcrypto/ec/ectest.c
@@ -432,7 +432,9 @@ void prime_field_tests()
         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");
@@ -476,7 +478,9 @@ void prime_field_tests()
         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");
@@ -521,7 +525,9 @@ void prime_field_tests()
         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");
@@ -571,7 +577,9 @@ void prime_field_tests()
         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");
@@ -627,7 +635,9 @@ void prime_field_tests()
         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");
@@ -799,7 +809,7 @@ void prime_field_tests()
         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"); \
@@ -1326,7 +1336,7 @@ int main(int argc, char *argv[])
 #endif
         CRYPTO_cleanup_all_ex_data();
         ERR_free_strings();
-        ERR_remove_thread_state(NULL);
+        ERR_remove_state(0);
         CRYPTO_mem_leaks_fp(stderr);
         
         return 0;