From: Bodo Möller <bodo@openssl.org>
Date: Thu, 14 Feb 2002 14:41:13 +0000 (+0000)
Subject: make it possible to disable memory checking for timings
X-Git-Tag: OpenSSL-engine-0_9_6c^2^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f06b003736c957c6e693d3b5dd1393f91a530cd;p=oweals%2Fopenssl.git

make it possible to disable memory checking for timings
---

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index b6ede1c3c6..243cd83fb5 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -156,7 +156,12 @@ int main(int argc, char *argv[])
 	if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))))
 		{
 		CRYPTO_malloc_debug_init();
-		CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
+		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();
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 339f654516..ff9338c4c9 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -330,17 +330,25 @@ int main(void)
 	double		time_d;
 	EVP_MD_CTX	*md_ctx=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);
 
-	RAND_seed(rnd_seed, sizeof(rnd_seed));
+	ERR_load_crypto_strings();
 
 	if (bio_err == NULL)
 		bio_err=BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	CRYPTO_malloc_debug_init();
-	CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-	ERR_load_crypto_strings();
+	RAND_seed(rnd_seed, sizeof(rnd_seed));
 
 	if ((ecdsa = ECDSA_new()) == NULL)   goto err;