diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-26 16:43:54 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-26 16:43:54 -0400 |
| commit | cf10df81e11eaba257368d1996a24fc3fc6d37f4 (patch) | |
| tree | e3431d55edae41e627812f3b2149f636afaccd33 | |
| parent | 710756a9b384c9e9eaaf42acaf429aebc2a822a1 (diff) | |
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)
| -rw-r--r-- | test/sslapitest.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index 7c0171b1db..c43adba159 100644 --- 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_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); - 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); - 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. */ @@ -334,18 +334,18 @@ static int test_keylog_no_master_key(void) &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); - 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); - 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. */ |