remove OPENSSL_malloc and CRYPTO_malloc goo from the regress tests.

ok miod@ jsing@ guenther@

1 files changed, 4 insertions, 8 deletions

diff --git a/src/regress/lib/libcrypto/ecdh/ecdhtest.c b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
index bf362245bb..385f6803aa 100644
--- a/src/regress/lib/libcrypto/ecdh/ecdhtest.c
+++ b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
@@ -160,14 +160,14 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
         (void)BIO_flush(out);
 
         alen=KDF1_SHA1_len;
-        abuf=(unsigned char *)OPENSSL_malloc(alen);
+        abuf=malloc(alen);
         aout=ECDH_compute_key(abuf,alen,EC_KEY_get0_public_key(b),a,KDF1_SHA1);
 
         BIO_printf(out,".");
         (void)BIO_flush(out);
 
         blen=KDF1_SHA1_len;
-        bbuf=(unsigned char *)OPENSSL_malloc(blen);
+        bbuf=malloc(blen);
         bout=ECDH_compute_key(bbuf,blen,EC_KEY_get0_public_key(a),b,KDF1_SHA1);
 
         BIO_printf(out,".");
@@ -218,8 +218,8 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
 err:
         ERR_print_errors_fp(stderr);
 
-        if (abuf != NULL) OPENSSL_free(abuf);
-        if (bbuf != NULL) OPENSSL_free(bbuf);
+        free(abuf);
+        free(bbuf);
         if (x_a) BN_free(x_a);
         if (y_a) BN_free(y_a);
         if (x_b) BN_free(x_b);
@@ -235,10 +235,6 @@ int main(int argc, char *argv[])
         int ret=1;
         BIO *out;
 
-        CRYPTO_malloc_debug_init();
-        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
         out=BIO_new(BIO_s_file());
         if (out == NULL) exit(1);
         BIO_set_fp(out,stdout,BIO_NOCLOSE);