[openssl-commits] [openssl] master update

paul.dale at oracle.com paul.dale at oracle.com
Thu Jul 27 23:48:16 UTC 2017


The branch master has been updated
       via  735e350555a7f965ccb366afdabe569651d19d82 (commit)
       via  e89f5fb37014514f0c273980c3d6cbedfa73f862 (commit)
      from  d3b58b953c25b781bb4582a174dbe1e8ac68cfa3 (commit)


- Log -----------------------------------------------------------------
commit 735e350555a7f965ccb366afdabe569651d19d82
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Jul 28 09:26:40 2017 +1000

    Formatting & declaration cleanse.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4032)

commit e89f5fb37014514f0c273980c3d6cbedfa73f862
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Jul 28 09:25:59 2017 +1000

    OPENSSL_NO_ENGINE defined causes build failures
    
    TEST_note as an undefined link symbol is the symptom.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4032)

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

Summary of changes:
 test/enginetest.c | 3 ++-
 test/testutil.h   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/enginetest.c b/test/enginetest.c
index d32260f..4e78277 100644
--- a/test/enginetest.c
+++ b/test/enginetest.c
@@ -12,12 +12,13 @@
 #include <stdlib.h>
 #include <openssl/e_os2.h>
 
+# include "testutil.h"
+
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/buffer.h>
 # include <openssl/crypto.h>
 # include <openssl/engine.h>
 # include <openssl/err.h>
-# include "testutil.h"
 
 static void display_engine_list(void)
 {
diff --git a/test/testutil.h b/test/testutil.h
index 9786579..8387e72 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -142,7 +142,7 @@ const char *test_get_option_argument(const char *option);
  * rather link to one of the helper main() methods.
  */
 
-void add_test(const char *test_case_name, int (*test_fn) ());
+void add_test(const char *test_case_name, int (*test_fn) (void));
 void add_all_tests(const char *test_case_name, int (*test_fn)(int idx), int num,
                    int subtest);
 
@@ -170,7 +170,7 @@ void cleanup_tests(void);
 # endif
 #endif
 
-#  define DECLARE_COMPARISON(type, name, opname)                        \
+# define DECLARE_COMPARISON(type, name, opname)                         \
     int test_ ## name ## _ ## opname(const char *, int,                 \
                                      const char *, const char *,        \
                                      const type, const type);


More information about the openssl-commits mailing list