From c23add3676634ced6662929d60f266a9f5062e7b Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Sun, 9 Aug 2020 17:26:39 +1000 Subject: Fix memory leak in drbgtest Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/12613) --- test/drbgtest.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'test/drbgtest.c') diff --git a/test/drbgtest.c b/test/drbgtest.c index c6c8438e98..fbe5c78c58 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -531,10 +531,10 @@ static EVP_RAND_CTX *new_drbg(EVP_RAND_CTX *parent) if (!TEST_ptr(rand = EVP_RAND_fetch(NULL, "CTR-DRBG", NULL)) || !TEST_ptr(drbg = EVP_RAND_CTX_new(rand, parent)) || !TEST_true(EVP_RAND_set_ctx_params(drbg, params))) { - EVP_RAND_CTX_rand(drbg); - EVP_RAND_free(rand); + EVP_RAND_CTX_free(drbg); drbg = NULL; } + EVP_RAND_free(rand); return drbg; } @@ -627,13 +627,6 @@ err: int setup_tests(void) { - /* - * TODO(3.0): figure out why and fix. - * Create the primary DRBG here to avoid a memory leak if it is done in - * the test cases. - */ - if (RAND_get0_primary(NULL) == NULL) - return 0; ADD_TEST(test_rand_drbg_reseed); ADD_TEST(test_rand_drbg_prediction_resistance); #if defined(OPENSSL_THREADS) -- cgit v1.2.3