diff options
| -rw-r--r-- | crypto/ec/ectest.c | 7 | ||||
| -rw-r--r-- | crypto/ecdsa/ecdsatest.c | 20 |
2 files changed, 20 insertions, 7 deletions
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c index b6ede1c3c..243cd83fb 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 339f65451..ff9338c4c 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; |