[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  26db32469f381f75e11af25ddc2d1a8e83eeba45 (commit)
      from  efe749c84050b99a8470aa58a6c464cf886cfc00 (commit)


- Log -----------------------------------------------------------------
commit 26db32469f381f75e11af25ddc2d1a8e83eeba45
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Mar 30 19:17:39 2018 +0200

    Fix a gcc-8 warning -Wcast-function-type
    
    Casting to the generic function type "void (*)(void)"
    prevents the warning.
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/5816)

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

Summary of changes:
 test/shlibloadtest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index a8cf8e7..aad90e6 100644
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -23,7 +23,7 @@ typedef SSL_CTX * (*SSL_CTX_new_t)(const SSL_METHOD *meth);
 typedef void (*SSL_CTX_free_t)(SSL_CTX *);
 typedef unsigned long (*ERR_get_error_t)(void);
 typedef unsigned long (*OpenSSL_version_num_t)(void);
-typedef DSO * (*DSO_dsobyaddr_t)(void (*addr)(), int flags);
+typedef DSO * (*DSO_dsobyaddr_t)(void (*addr)(void), int flags);
 typedef int (*DSO_free_t)(DSO *dso);
 
 typedef enum test_types_en {
@@ -191,7 +191,7 @@ static int test_lib(void)
         {
             DSO *hndl;
             /* use known symbol from crypto module */
-            if (!TEST_ptr(hndl = myDSO_dsobyaddr((void (*)())ERR_get_error, 0)))
+            if (!TEST_ptr(hndl = myDSO_dsobyaddr((void (*)(void))ERR_get_error, 0)))
                 goto end;
             myDSO_free(hndl);
         }