[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  180c3fc7754f098b385c9a978491a2d468092bca (commit)
      from  e3743355e840dadff0b09582942b7a90db607894 (commit)


- Log -----------------------------------------------------------------
commit 180c3fc7754f098b385c9a978491a2d468092bca
Author: David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Thu Aug 10 09:07:37 2017 +0200

    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 at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4131)

-----------------------------------------------------------------------

Summary of changes:
 test/testutil/driver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index cf4296a..274d3cd 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)