make it possible to disable memory checking for timings

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index b6ede1c3c6ab004a3e25bff4c480e62b48a0537e..243cd83fb54aa7d0cb5ebc06b0a8a74dd7e080ed 100644 (file)
--- 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 339f654516b7b6dfc2b7f576d6bed273cb058f27..ff9338c4c98d3a49155e6db6d6e5781f620788e3 100644 (file)
--- 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;