Fix ISO C function/object pointer issue

Showed up on GCC with strict warnings.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3325)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 7c0171b1db7f5894eae1349846809a83b21fb270..c43adba15947b27af7915801cf3ad505dd487b71 100644 (file)
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -264,16 +264,16 @@ static int test_keylog(void)
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx, "RSA")))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx, "RSA")))
         goto end;
 

-    if (!TEST_ptr_null((void *)SSL_CTX_get_keylog_callback(cctx))
-            || !TEST_ptr_null((void *)SSL_CTX_get_keylog_callback(sctx)))
+    if (!TEST_true(SSL_CTX_get_keylog_callback(cctx) == NULL)
+            || !TEST_true(SSL_CTX_get_keylog_callback(sctx) == NULL))

         goto end;
     SSL_CTX_set_keylog_callback(cctx, client_keylog_callback);
         goto end;
     SSL_CTX_set_keylog_callback(cctx, client_keylog_callback);

-    if (!TEST_ptr_eq((void *)SSL_CTX_get_keylog_callback(cctx),
-                     (void *)client_keylog_callback))
+    if (!TEST_true(SSL_CTX_get_keylog_callback(cctx)
+                   == client_keylog_callback))

         goto end;
     SSL_CTX_set_keylog_callback(sctx, server_keylog_callback);
         goto end;
     SSL_CTX_set_keylog_callback(sctx, server_keylog_callback);

-    if (!TEST_ptr_eq((void *)SSL_CTX_get_keylog_callback(sctx),
-                     (void *)server_keylog_callback))
+    if (!TEST_true(SSL_CTX_get_keylog_callback(sctx)
+                   == server_keylog_callback))

         goto end;
 
     /* Now do a handshake and check that the logs have been written to. */
         goto end;
 
     /* Now do a handshake and check that the logs have been written to. */


@@ -334,18 +334,18 @@ static int test_keylog_no_master_key(void)
                              &cctx, cert, privkey)))
         return 0;
 
                              &cctx, cert, privkey)))
         return 0;
 

-    if (!TEST_ptr_null((void *)SSL_CTX_get_keylog_callback(cctx))
-            || !TEST_ptr_null((void *)SSL_CTX_get_keylog_callback(sctx)))
+    if (!TEST_true(SSL_CTX_get_keylog_callback(cctx) == NULL)
+            || !TEST_true(SSL_CTX_get_keylog_callback(sctx) == NULL))

         goto end;
 
     SSL_CTX_set_keylog_callback(cctx, client_keylog_callback);
         goto end;
 
     SSL_CTX_set_keylog_callback(cctx, client_keylog_callback);

-    if (!TEST_ptr_eq((void *)SSL_CTX_get_keylog_callback(cctx),
-                     (void *)client_keylog_callback))
+    if (!TEST_true(SSL_CTX_get_keylog_callback(cctx)
+                   == client_keylog_callback))

         goto end;
 
     SSL_CTX_set_keylog_callback(sctx, server_keylog_callback);
         goto end;
 
     SSL_CTX_set_keylog_callback(sctx, server_keylog_callback);

-    if (!TEST_ptr_eq((void *)SSL_CTX_get_keylog_callback(sctx),
-                     (void *)server_keylog_callback))
+    if (!TEST_true(SSL_CTX_get_keylog_callback(sctx)
+                   == server_keylog_callback))

         goto end;
 
     /* Now do a handshake and check that the logs have been written to. */
         goto end;
 
     /* Now do a handshake and check that the logs have been written to. */