mirror of
https://github.com/curl/curl.git
synced 2026-01-27 09:54:22 +00:00
`-Weverything` is not enabled by curl, and not recommended by LLVM, because it may enable experimental options, and will result in new fallouts after toolchain upgrades. This patch aims to fix/silence as much as possible as found with llvm/clang 21.1.0. It also permanently enables warnings that were fixed in source and deemed manageable in the future. `-Wformat` warnings are addressed separately via #18343. Fix/silence warnings in the source: - typecheck-gcc.h: fix `-Wreserved-identifier`. - lib: silence `-Wcast-function-type-strict`. For llvm 16+ or Apple clang 16+. - asyn-ares: limit `HAPPY_EYEBALLS_DNS_TIMEOUT` to old c-ares versions. - curl_trc: fix `-Wc++-hidden-decl`. - doh: fix `-Wc++-keyword`. - ftp: fix `-Wreserved-identifier`. - ldap: fix `-Wreserved-identifier`. - mqtt: comment unused macro to avoid warning. - multi_ev: drop unused macros to avoid warnings. - setopt: fix useless `break;` after `return;`. - gtls, mbedtls, rustls: silence `-Wconditional-uninitialized`. - socks_sspi, schannel, x509asn1: fix `-Wimplicit-int-enum-cast`. - x509asn1: fix `-Wc++-keyword`. - openssl: scope `OSSL_UI_METHOD_CAST` to avoid unused macro warning. - libssh2, wolfssl: drop unused macros. - curl_ngtcp2, curl_quiche, httpsrr, urlapi: drop/limit unused macros. - tool_getparam: fix useless `break;` after `return;` or `break;`. Not normally enabled because it doesn't work with unity. https://github.com/llvm/llvm-project/issues/71046 - tool_operate: fix `-Wc++-keyword`. - curlinfo: fix a `-Wunsafe-buffer-usage`. - tests: silence `-Wformat-non-iso`. - lib557: fix `-Wreserved-identifier`. - lib1565: silence `-Wconditional-uninitialized`. Enable the above clang warnings permanently in picky mode: - `-Wc++-hidden-decl` - `-Wc++-keyword` (except for Windows, where it collides with `wchar_t`) - `-Wcast-function-type-strict` - `-Wcast-function-type` - `-Wconditional-uninitialized` - `-Wformat-non-iso` (except for clang-cl) - `-Wreserved-identifier` - `-Wtentative-definition-compat` Silence problematic `-Weverything` warnings globally (in picky mode): - `-Wused-but-marked-unused` (88000+ hits) and `-Wdisabled-macro-expansion` (2600+ hits). Triggered by `typecheck-gcc.h` when building with clang 14+. Maybe there exists a way to fix within that header? Ref: https://discourse.llvm.org/t/removing-wused-but-marked-unused/55310 - `-Wunsafe-buffer-usage`. clang 16+. 7000+ hits. May be useful in theory, but such high volume of hits makes it impractical to review and possibly address. Meant for C++. Ref: https://clang.llvm.org/docs/SafeBuffers.html Ref: https://stackoverflow.com/questions/77017567/how-to-fix-code-to-avoid-warning-wunsafe-buffer-usage Ref: https://discourse.llvm.org/t/rfc-c-buffer-hardening/65734 Ref: https://github.com/llvm/llvm-project/pull/111624 - `-Wimplicit-void-ptr-cast`. clang 21+. 1700+ hits. C++ warning, deemed pure noise. Ref: https://github.com/curl/curl/issues/18470#issuecomment-3253506266 - `-Wswitch-default` (180+ hits), `-Wswitch-enum` (190+ hits), `-Wcovered-switch-default` (20+ hits). Next to impossible to fix cleanly, esp. when the covered `case` branches depend on compile-time options. - `-Wdocumentation-unknown-command` (8+ hits). Triggered in a few sources. Seems arbitrary and bogus. - `-Wpadded` (550+ hits). - `-Wc++-keyword` on Windows, where it collides with `wchar_t`. (100+ hits) Ref: https://github.com/llvm/llvm-project/issues/155988 - `-Wreserved-macro-identifier`. clang 13+. 5+ hits. Sometimes it's necessary to set external macros that use the reserved namespace. E.g. `_CRT_NONSTDC_NO_DEPRECATE`, `__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__`, `__NO_NET_API`, possibly `_REENTRANT`, and more. It's not worth trying to silence them individually. - `-Wnonportable-system-include-path` with `clang-cl`. It'd be broken by doing what the warning suggests. - `-Wformat-non-iso` for clang-cl. CMake `PICKY_COMPILER=ON` (the default) or `./configure` `--enable-warnings` (not the default) is required to enable these silencing rules. Also: - autotools, cmake: fix Apple clang and mainline llvm version translations. Ref: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions - autotools, cmake: enable `-Warray-compare` for clang 20+. Follow-up to 4b7accda5ae3f2e663aa3f3853805241ef87c2fe #17196 - cmake: fix to enable `-Wmissing-variable-declarations` at an earlier clang version. - cmake: update internal logic to handle warning options with `+` in them. - cmake: fix internal logic to match the whole option when looking into `CMAKE_C_FLAGS` for custom-disabled warnings. Follow-up to b85cb8cb4e143d1615d4fcc1ce8f2f7b66453995 #18485 Closes #18477
212 lines
6.5 KiB
C
212 lines
6.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef USE_HTTPSRR
|
|
|
|
#include "urldata.h"
|
|
#include "curl_addrinfo.h"
|
|
#include "httpsrr.h"
|
|
#include "connect.h"
|
|
#include "sendf.h"
|
|
#include "strdup.h"
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
static CURLcode httpsrr_decode_alpn(const char *cp, size_t len,
|
|
unsigned char *alpns)
|
|
{
|
|
/*
|
|
* The wire-format value for "alpn" consists of at least one alpn-id
|
|
* prefixed by its length as a single octet, and these length-value pairs
|
|
* are concatenated to form the SvcParamValue. These pairs MUST exactly fill
|
|
* the SvcParamValue; otherwise, the SvcParamValue is malformed.
|
|
*/
|
|
int idnum = 0;
|
|
|
|
while(len > 0) {
|
|
size_t tlen = (size_t) *cp++;
|
|
enum alpnid id;
|
|
len--;
|
|
if(tlen > len)
|
|
return CURLE_BAD_CONTENT_ENCODING;
|
|
|
|
/* we only store ALPN ids we know about */
|
|
id = Curl_alpn2alpnid(cp, tlen);
|
|
if(id != ALPN_none) {
|
|
if(idnum == MAX_HTTPSRR_ALPNS)
|
|
break;
|
|
if(idnum && memchr(alpns, id, idnum))
|
|
/* this ALPN id is already stored */
|
|
;
|
|
else
|
|
alpns[idnum++] = (unsigned char)id;
|
|
}
|
|
cp += tlen;
|
|
len -= tlen;
|
|
}
|
|
if(idnum < MAX_HTTPSRR_ALPNS)
|
|
alpns[idnum] = ALPN_none; /* terminate the list */
|
|
return CURLE_OK;
|
|
}
|
|
|
|
CURLcode Curl_httpsrr_set(struct Curl_easy *data,
|
|
struct Curl_https_rrinfo *hi,
|
|
uint16_t rrkey, const uint8_t *val, size_t vlen)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
switch(rrkey) {
|
|
case HTTPS_RR_CODE_MANDATORY:
|
|
CURL_TRC_DNS(data, "HTTPS RR MANDATORY left to implement");
|
|
break;
|
|
case HTTPS_RR_CODE_ALPN: /* str_list */
|
|
result = httpsrr_decode_alpn((const char *)val, vlen, hi->alpns);
|
|
CURL_TRC_DNS(data, "HTTPS RR ALPN: %u %u %u %u",
|
|
hi->alpns[0], hi->alpns[1], hi->alpns[2], hi->alpns[3]);
|
|
break;
|
|
case HTTPS_RR_CODE_NO_DEF_ALPN:
|
|
if(vlen) /* no data */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->no_def_alpn = TRUE;
|
|
CURL_TRC_DNS(data, "HTTPS RR no-def-alpn");
|
|
break;
|
|
case HTTPS_RR_CODE_IPV4: /* addr4 list */
|
|
if(!vlen || (vlen & 3)) /* the size must be 4-byte aligned */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->ipv4hints = Curl_memdup(val, vlen);
|
|
if(!hi->ipv4hints)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
hi->ipv4hints_len = vlen;
|
|
CURL_TRC_DNS(data, "HTTPS RR IPv4");
|
|
break;
|
|
case HTTPS_RR_CODE_ECH:
|
|
if(!vlen)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->echconfiglist = Curl_memdup(val, vlen);
|
|
if(!hi->echconfiglist)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
hi->echconfiglist_len = vlen;
|
|
CURL_TRC_DNS(data, "HTTPS RR ECH");
|
|
break;
|
|
case HTTPS_RR_CODE_IPV6: /* addr6 list */
|
|
if(!vlen || (vlen & 15)) /* the size must be 16-byte aligned */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->ipv6hints = Curl_memdup(val, vlen);
|
|
if(!hi->ipv6hints)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
hi->ipv6hints_len = vlen;
|
|
CURL_TRC_DNS(data, "HTTPS RR IPv6");
|
|
break;
|
|
case HTTPS_RR_CODE_PORT:
|
|
if(vlen != 2)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
hi->port = (unsigned short)((val[0] << 8) | val[1]);
|
|
CURL_TRC_DNS(data, "HTTPS RR port %u", hi->port);
|
|
break;
|
|
default:
|
|
CURL_TRC_DNS(data, "HTTPS RR unknown code");
|
|
break;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
struct Curl_https_rrinfo *
|
|
Curl_httpsrr_dup_move(struct Curl_https_rrinfo *rrinfo)
|
|
{
|
|
struct Curl_https_rrinfo *dup = Curl_memdup(rrinfo, sizeof(*rrinfo));
|
|
if(dup)
|
|
memset(rrinfo, 0, sizeof(*rrinfo));
|
|
return dup;
|
|
}
|
|
|
|
void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo)
|
|
{
|
|
Curl_safefree(rrinfo->target);
|
|
Curl_safefree(rrinfo->echconfiglist);
|
|
Curl_safefree(rrinfo->ipv4hints);
|
|
Curl_safefree(rrinfo->ipv6hints);
|
|
}
|
|
|
|
|
|
#ifdef USE_ARES
|
|
|
|
static CURLcode httpsrr_opt(struct Curl_easy *data,
|
|
const ares_dns_rr_t *rr,
|
|
ares_dns_rr_key_t key, size_t idx,
|
|
struct Curl_https_rrinfo *hinfo)
|
|
{
|
|
const unsigned char *val = NULL;
|
|
unsigned short code;
|
|
size_t len = 0;
|
|
|
|
code = ares_dns_rr_get_opt(rr, key, idx, &val, &len);
|
|
return Curl_httpsrr_set(data, hinfo, code, val, len);
|
|
}
|
|
|
|
CURLcode Curl_httpsrr_from_ares(struct Curl_easy *data,
|
|
const ares_dns_record_t *dnsrec,
|
|
struct Curl_https_rrinfo *hinfo)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
size_t i;
|
|
|
|
for(i = 0; i < ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER); i++) {
|
|
const char *target;
|
|
size_t opt;
|
|
const ares_dns_rr_t *rr =
|
|
ares_dns_record_rr_get_const(dnsrec, ARES_SECTION_ANSWER, i);
|
|
if(ares_dns_rr_get_type(rr) != ARES_REC_TYPE_HTTPS)
|
|
continue;
|
|
/* When SvcPriority is 0, the SVCB record is in AliasMode. Otherwise, it
|
|
is in ServiceMode */
|
|
target = ares_dns_rr_get_str(rr, ARES_RR_HTTPS_TARGET);
|
|
if(target && target[0]) {
|
|
hinfo->target = strdup(target);
|
|
if(!hinfo->target) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
CURL_TRC_DNS(data, "HTTPS RR target: %s", hinfo->target);
|
|
}
|
|
CURL_TRC_DNS(data, "HTTPS RR priority: %u",
|
|
ares_dns_rr_get_u16(rr, ARES_RR_HTTPS_PRIORITY));
|
|
for(opt = 0; opt < ares_dns_rr_get_opt_cnt(rr, ARES_RR_HTTPS_PARAMS);
|
|
opt++) {
|
|
result = httpsrr_opt(data, rr, ARES_RR_HTTPS_PARAMS, opt, hinfo);
|
|
if(result)
|
|
break;
|
|
}
|
|
}
|
|
out:
|
|
return result;
|
|
}
|
|
|
|
#endif /* USE_ARES */
|
|
|
|
#endif /* USE_HTTPSRR */
|