From cae65df81b69f410afddb3d880daac7c43ce3daf Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sat, 24 May 2014 13:57:18 +0000
Subject: remove OPENSSL_malloc and CRYPTO_malloc goo from the regress tests.
 ok miod@ jsing@ guenther@

---
 src/regress/lib/libcrypto/dh/dhtest.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/regress/lib/libcrypto/dh/dhtest.c')

diff --git a/src/regress/lib/libcrypto/dh/dhtest.c b/src/regress/lib/libcrypto/dh/dhtest.c
index 916d7aeff0..9851c4f0c6 100644
--- a/src/regress/lib/libcrypto/dh/dhtest.c
+++ b/src/regress/lib/libcrypto/dh/dhtest.c
@@ -86,10 +86,6 @@ int main(int argc, char *argv[])
 	int i,alen,blen,aout,bout,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);
@@ -141,7 +137,7 @@ int main(int argc, char *argv[])
 	BIO_puts(out,"\n");
 
 	alen=DH_size(a);
-	abuf=(unsigned char *)OPENSSL_malloc(alen);
+	abuf=malloc(alen);
 	aout=DH_compute_key(abuf,b->pub_key,a);
 
 	BIO_puts(out,"key1 =");
@@ -153,7 +149,7 @@ int main(int argc, char *argv[])
 	BIO_puts(out,"\n");
 
 	blen=DH_size(b);
-	bbuf=(unsigned char *)OPENSSL_malloc(blen);
+	bbuf=malloc(blen);
 	bout=DH_compute_key(bbuf,a->pub_key,b);
 
 	BIO_puts(out,"key2 =");
@@ -173,8 +169,8 @@ int main(int argc, char *argv[])
 err:
 	ERR_print_errors_fp(stderr);
 
-	if (abuf != NULL) OPENSSL_free(abuf);
-	if (bbuf != NULL) OPENSSL_free(bbuf);
+	free(abuf);
+	free(bbuf);
 	if(b != NULL) DH_free(b);
 	if(a != NULL) DH_free(a);
 	BIO_free(out);
-- 
cgit v1.2.3-55-g6feb