aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid von Oheimb <David.von.Oheimb@siemens.com>2017-08-10 09:07:37 +0200
committerRich Salz <rsalz@openssl.org>2017-08-10 11:05:28 -0400
commit180c3fc7754f098b385c9a978491a2d468092bca (patch)
tree07fc63ec4ce28f22ad734e8bbef1c487bf00db53
parente3743355e840dadff0b09582942b7a90db607894 (diff)
downloadopenssl-180c3fc7754f098b385c9a978491a2d468092bca.tar.gz
Fix minor type warnings and risk of memory leak in testutil/driver.c
Discussion is in https://github.com/openssl/openssl/issues/4127 Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4131)
-rw-r--r--test/testutil/driver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index cf4296a23f..274d3cde72 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -40,7 +40,7 @@ static int seed = 0;
*/
static int num_test_cases = 0;
-void add_test(const char *test_case_name, int (*test_fn) ())
+void add_test(const char *test_case_name, int (*test_fn) (void))
{
assert(num_tests != OSSL_NELEM(all_tests));
all_tests[num_tests].test_case_name = test_case_name;
@@ -105,7 +105,7 @@ void setup_test_framework()
if (test_seed != NULL) {
seed = atoi(test_seed);
if (seed <= 0)
- seed = time(NULL);
+ seed = (int)time(NULL);
test_printf_stdout("%*s# RAND SEED %d\n", subtest_level(), "", seed);
test_flush_stdout();
srand(seed);
@@ -121,6 +121,7 @@ void setup_test_framework()
int pulldown_test_framework(int ret)
{
+ set_test_title(NULL);
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
if (should_report_leaks()
&& CRYPTO_mem_leaks_cb(openssl_error_cb, NULL) <= 0)