From f1a6f190a66215029b10fad630629959f69b50c1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 May 2026 13:39:48 +0200 Subject: [PATCH] badwords: prefer 'workaround' (without hyphen) Closes #21807 --- docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.md | 4 ++-- docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md | 4 ++-- docs/libcurl/opts/CURLOPT_STDERR.md | 2 +- docs/tests/TEST-SUITE.md | 2 +- include/curl/curl.h | 2 +- lib/curl_addrinfo.c | 2 +- lib/gopher.c | 2 +- lib/if2ip.h | 2 +- lib/vtls/openssl.c | 12 ++++++------ scripts/badwords.txt | 2 ++ src/tool_getparam.c | 2 +- 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.md b/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.md index e7c596d15a..0b491eeff6 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.md +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.md @@ -38,10 +38,10 @@ behaviors. Available bits: Tells libcurl to not attempt to use any workarounds for a security flaw in the SSL3 and TLS1.0 protocols. If this option is not used or this bit is set to 0, -the SSL layer libcurl uses may use a work-around for this flaw although it +the SSL layer libcurl uses may use a workaround for this flaw although it might cause interoperability problems with some (older) SSL implementations. -**WARNING:** avoiding this work-around lessens the security, and by setting +**WARNING:** avoiding this workaround lessens the security, and by setting this option to 1 you ask for exactly that. This option is only supported for Secure Transport and OpenSSL. diff --git a/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md b/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md index 1314ae0e8d..13dd45077d 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md +++ b/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.md @@ -36,10 +36,10 @@ behaviors. Available bits: Tells libcurl to not attempt to use any workarounds for a security flaw in the SSL3 and TLS1.0 protocols. If this option is not used or this bit is set to 0, -the SSL layer libcurl uses may use a work-around for this flaw although it +the SSL layer libcurl uses may use a workaround for this flaw although it might cause interoperability problems with some (older) SSL implementations. -**WARNING:** avoiding this work-around lessens the security, and by setting +**WARNING:** avoiding this workaround lessens the security, and by setting this option to 1 you ask for exactly that. This option is only supported for Secure Transport and OpenSSL. diff --git a/docs/libcurl/opts/CURLOPT_STDERR.md b/docs/libcurl/opts/CURLOPT_STDERR.md index 213eb9ef0e..9294fafa60 100644 --- a/docs/libcurl/opts/CURLOPT_STDERR.md +++ b/docs/libcurl/opts/CURLOPT_STDERR.md @@ -33,7 +33,7 @@ data. If you are using libcurl as a Windows DLL, this option causes an exception and a crash in the library since it cannot access a FILE * passed on from the -application. A work-around is to instead use CURLOPT_DEBUGFUNCTION(3). +application. A workaround is to instead use CURLOPT_DEBUGFUNCTION(3). # DEFAULT diff --git a/docs/tests/TEST-SUITE.md b/docs/tests/TEST-SUITE.md index dc7671e2e6..51a3f20b22 100644 --- a/docs/tests/TEST-SUITE.md +++ b/docs/tests/TEST-SUITE.md @@ -136,7 +136,7 @@ set to identify the IP address and port number of the DNS server to use. host information - curl built to use `getaddrinfo()` for resolving *and* is built with c-ares - 1.26.0 or later, gets a special work-around. In such builds, when the + 1.26.0 or later, gets a special workaround. In such builds, when the environment variable is set, curl instead invokes a getaddrinfo wrapper that emulates the function and acknowledges the DNS server environment variable. This way, the getaddrinfo-using code paths in curl are verified, diff --git a/include/curl/curl.h b/include/curl/curl.h index 31c1bfb988..36af33e922 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -934,7 +934,7 @@ typedef enum { /* - ALLOW_BEAST tells libcurl to allow the BEAST SSL vulnerability in the name of improving interoperability with older servers. Some SSL libraries - have introduced work-arounds for this flaw but those work-arounds sometimes + have introduced workarounds for this flaw but those workarounds sometimes make the SSL communication fail. To regain functionality with those broken servers, a user can this way allow the vulnerability back. */ #define CURLSSLOPT_ALLOW_BEAST (1L << 0) diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 52d1e96a54..901727541f 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -603,7 +603,7 @@ int curl_dbg_getaddrinfo(const char *hostname, #if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS) /* - * Work-arounds the sin6_port is always zero bug on iOS 9.3.2 and macOS + * Works around the sin6_port is always zero bug on iOS 9.3.2 and macOS * 10.11.5. */ void Curl_addrinfo_set_port(struct Curl_addrinfo *addrinfo, int port) diff --git a/lib/gopher.c b/lib/gopher.c index f087121d07..039697466b 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -133,7 +133,7 @@ static CURLcode gopher_do(struct Curl_easy *data, bool *done) if(!timeout_ms) timeout_ms = TIMEDIFF_T_MAX; - /* Do not busyloop. The entire loop thing is a work-around as it causes a + /* Do not busyloop. The entire loop thing is a workaround as it causes a BLOCKING behavior which is a NO-NO. This function should rather be split up in a do and a doing piece where the pieces that are not possible to send now will be sent in the doing function repeatedly diff --git a/lib/if2ip.h b/lib/if2ip.h index 12fdaabd73..dc79c383b7 100644 --- a/lib/if2ip.h +++ b/lib/if2ip.h @@ -54,7 +54,7 @@ if2ip_result_t Curl_if2ip(int af, #ifdef __INTERIX -/* Nedelcho Stanev's work-around for SFU 3.0 */ +/* Nedelcho Stanev's workaround for SFU 3.0 */ struct ifreq { #define IFNAMSIZ 16 #define IFHWADDRLEN 6 diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 64c904dbf6..93409eb209 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -3724,8 +3724,8 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx, /* OpenSSL contains code to work around lots of bugs and flaws in various SSL-implementations. SSL_CTX_set_options() is used to enabled those - work-arounds. The man page for this option states that SSL_OP_ALL enables - all the work-arounds and that "It is usually safe to use SSL_OP_ALL to + workarounds. The man page for this option states that SSL_OP_ALL enables + all the workarounds and that "It is usually safe to use SSL_OP_ALL to enable the bug workaround options if compatibility with somewhat broken implementations is desired." @@ -3750,11 +3750,11 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx, CVE-2010-4180 when using previous OpenSSL versions we no longer enable this option regardless of OpenSSL version and SSL_OP_ALL definition. - OpenSSL added a work-around for an SSL 3.0/TLS 1.0 CBC vulnerability: + OpenSSL added a workaround for an SSL 3.0/TLS 1.0 CBC vulnerability: https://web.archive.org/web/20240114184648/openssl.org/~bodo/tls-cbc.txt. - In 0.9.6e they added a bit to SSL_OP_ALL that _disables_ that work-around + In 0.9.6e they added a bit to SSL_OP_ALL that _disables_ that workaround despite the fact that SSL_OP_ALL is documented to do "rather harmless" - workarounds. In order to keep the secure work-around, the + workarounds. In order to keep the secure workaround, the SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS bit must not be set. */ @@ -3764,7 +3764,7 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx, ctx_options &= ~(ctx_option_t)SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG; /* unless the user explicitly asks to allow the protocol vulnerability we - use the work-around */ + use the workaround */ if(!ssl_config->enable_beast) ctx_options &= ~(ctx_option_t)SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; diff --git a/scripts/badwords.txt b/scripts/badwords.txt index 4f806eb718..81929c3d52 100644 --- a/scripts/badwords.txt +++ b/scripts/badwords.txt @@ -31,6 +31,8 @@ zero terminated:null-terminated nul terminator:null-terminator null terminator:null-terminator zero terminator:null-terminator +work-around:workaround or work around +work-arounds:workarounds or works around it's:it is aren't:are not can't:cannot diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 7e776ea6b6..05642e7a83 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -1449,7 +1449,7 @@ static ParameterError parse_range(struct OperationConfig *config, curlx_str_single(&nextarg, '-')) { /* Specifying a range WITHOUT A DASH does create an illegal HTTP range (and does not actually be range by definition). The man page previously - claimed that to be a good way, why this code is added to work-around + claimed that to be a good way, why this code is added to work around it. */ char buffer[32]; warnf("A specified range MUST include at least one dash (-). "