Commit 8f06b003 authored by Bodo Möller's avatar Bodo Möller
Browse files

make it possible to disable memory checking for timings

parent 1dea1f45

crypto/ec/ectest.c

+6 −1
Original line number Diff line number Diff line
@@ -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();

crypto/ecdsa/ecdsatest.c

+14 −6
Original line number Diff line number Diff line
@@ -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;