[openssl] master update
shane.lontis at oracle.com
shane.lontis at oracle.com
Mon Aug 10 00:53:33 UTC 2020
The branch master has been updated
via c23add3676634ced6662929d60f266a9f5062e7b (commit)
from 04cb5ec0b74896fe806625ac4d87e3396890f246 (commit)
- Log -----------------------------------------------------------------
commit c23add3676634ced6662929d60f266a9f5062e7b
Author: Shane Lontis <shane.lontis at oracle.com>
Date: Sun Aug 9 17:26:39 2020 +1000
Fix memory leak in drbgtest
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/12613)
-----------------------------------------------------------------------
Summary of changes:
test/drbgtest.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
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)
More information about the openssl-commits
mailing list