diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-08-04 00:04:39 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-04 00:07:02 +0200 |
| commit | af271ce9b9717ba289417e9cbb7f278c2a12f959 (patch) | |
| tree | bcc4c3ded1d2ac9493edda4b148b5e3349573250 | |
| parent | 6f6cfc90bef1fa5044c7aa163d9d254f43d8dbc9 (diff) | |
| download | curl-af271ce9b9717ba289417e9cbb7f278c2a12f959.tar.gz | |
darwin: silence compiler warnings
With a clang pragma and three type fixes
Fixes #1722
| -rw-r--r-- | lib/vtls/darwinssl.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/vtls/darwinssl.c b/lib/vtls/darwinssl.c index 65378e3cb..20089dbe0 100644 --- a/lib/vtls/darwinssl.c +++ b/lib/vtls/darwinssl.c @@ -34,6 +34,11 @@ #ifdef USE_DARWINSSL +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wtautological-pointer-compare" +#endif __clang__ + #ifdef HAVE_LIMITS_H #include <limits.h> #endif @@ -2033,7 +2038,8 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, const char *pinnedpubkey) { /* Scratch */ size_t pubkeylen, realpubkeylen, spkiHeaderLength = 24; - unsigned char *pubkey = NULL, *realpubkey = NULL, *spkiHeader = NULL; + unsigned char *pubkey = NULL, *realpubkey = NULL; + const unsigned char *spkiHeader = NULL; CFDataRef publicKeyBits = NULL; /* Result is returned to caller */ @@ -2076,7 +2082,7 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data, #endif /* DARWIN_SSL_PINNEDPUBKEY_V2 */ pubkeylen = CFDataGetLength(publicKeyBits); - pubkey = CFDataGetBytePtr(publicKeyBits); + pubkey = (unsigned char *)CFDataGetBytePtr(publicKeyBits); switch(pubkeylen) { case 526: @@ -2845,4 +2851,8 @@ static ssize_t darwinssl_recv(struct connectdata *conn, return (ssize_t)processed; } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + #endif /* USE_DARWINSSL */ |