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/engine/enginetest.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/regress/lib/libcrypto/engine/enginetest.c')

diff --git a/src/regress/lib/libcrypto/engine/enginetest.c b/src/regress/lib/libcrypto/engine/enginetest.c
index f4d70e7e0a..5032dc47e7 100644
--- a/src/regress/lib/libcrypto/engine/enginetest.c
+++ b/src/regress/lib/libcrypto/engine/enginetest.c
@@ -105,18 +105,6 @@ int main(int argc, char *argv[])
 	ENGINE *new_h3 = NULL;
 	ENGINE *new_h4 = NULL;
 
-	/* enable memory leak checking unless explicitly disabled */
-	if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))))
-		{
-		CRYPTO_malloc_debug_init();
-		CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-		}
-	else
-		{
-		/* OPENSSL_DEBUG_MEMORY=off */
-		CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
-		}
-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 	ERR_load_crypto_strings();
 
 	memset(block, 0, 512 * sizeof(ENGINE *));
@@ -258,8 +246,8 @@ cleanup_loop:
 		}
 	for(loop = 0; loop < 512; loop++)
 		{
-		OPENSSL_free((void *)ENGINE_get_id(block[loop]));
-		OPENSSL_free((void *)ENGINE_get_name(block[loop]));
+		free((void *)ENGINE_get_id(block[loop]));
+		free((void *)ENGINE_get_name(block[loop]));
 		}
 	printf("\nTests completed happily\n");
 	to_return = 0;
-- 
cgit v1.2.3-55-g6feb