]> git.ipfire.org Git - thirdparty/curl.git/log
thirdparty/curl.git
15 months agosrc: replace copy of printf mappings with an include
Viktor Szakats [Thu, 22 Aug 2024 15:12:09 +0000 (17:12 +0200)] 
src: replace copy of printf mappings with an include

Closes #14648

15 months agocmake: pkg-config 'found' message sync with native CMake
Viktor Szakats [Thu, 22 Aug 2024 14:39:50 +0000 (16:39 +0200)] 
cmake: pkg-config 'found' message sync with native CMake

Cherry-picked from #14610

15 months agoGHA: trim markdown headers before proselinting
Daniel Stenberg [Thu, 22 Aug 2024 10:47:16 +0000 (12:47 +0200)] 
GHA: trim markdown headers before proselinting

Allow interface.md to use more exclamation marks.

Closes #14645

15 months agoGHA: add a checksrc job
Daniel Stenberg [Wed, 21 Aug 2024 07:19:27 +0000 (09:19 +0200)] 
GHA: add a checksrc job

This job unconditionally runs checksrc on ALL .c and .h files present in
git.

checksrc.pl: fixed to look for ".checksrc" in the same directory from
where it loads the file to check so that it an be invoked like this

Closes #14625

15 months agomisc: general C style cleanups
Daniel Stenberg [Thu, 22 Aug 2024 09:04:17 +0000 (11:04 +0200)] 
misc: general C style cleanups

... in code that previously was not checksrc'ed

Closes #14625

15 months agotidy-up: spelling WebSockets
Viktor Szakats [Wed, 21 Aug 2024 21:47:31 +0000 (23:47 +0200)] 
tidy-up: spelling WebSockets

Closes #14646

15 months agosrc: delete `curlx_m*printf()` aliases
Viktor Szakats [Thu, 22 Aug 2024 12:58:14 +0000 (14:58 +0200)] 
src: delete `curlx_m*printf()` aliases

A couple of seemingly random calls used them.
They were all mapped to `curl_m*printf()`.

Closes #14647

15 months agoconfigure: fix indentation
Viktor Szakats [Wed, 21 Aug 2024 09:08:54 +0000 (11:08 +0200)] 
configure: fix indentation

Also:
- move `then`s and an `in` inline.
- whitespace.

Closes #14628

15 months agodocs: Clarify OpenSSF Best Practices vs Scorecard
Chris Swan [Wed, 21 Aug 2024 13:26:59 +0000 (14:26 +0100)] 
docs: Clarify OpenSSF Best Practices vs Scorecard

SECURITY.md has a recently added section titled OpenSSF Scorecard
that actually documents OpenSSF Best Practices. Scorecard [0] is a
different OpenSSF project, that incorporates Best Practices, but is
distinct in its objectives and how it achieves them.
This change clarifies the terminology, and also removes any
implication that Gold Best Practices is an award rather than a self
certification programme.
As curl was a leader in implementing Best Practices some folk may be
more familiar with the earlier Core Infrastructure Initiative (CII)
naming, so a reference to that has been added.

[0] https://scorecard.dev/

Signed-off-by: Chris Swan <478926+cpswan@users.noreply.github.com>
Ref: #14319
Closes #14635

15 months agosectransp: fix setting tls version
Jan Venekamp [Wed, 21 Aug 2024 23:16:59 +0000 (01:16 +0200)] 
sectransp: fix setting tls version

Had multiple failures on test_17_09_ssl_min_max with --tlsv1 and
--tlsv1.3.

Closes #14621

15 months agotests: constrain http pytest to tests/http directory
Jan Venekamp [Wed, 21 Aug 2024 17:54:19 +0000 (19:54 +0200)] 
tests: constrain http pytest to tests/http directory

Running the http pytest had to be done from tests directory or above,
because the repeat argument fixture was defined in tests/conftest.py.
However, the repeat argument is not needed because its functionality
can be provided by pytest-repeat as documented in the test's
README.md. So, removed the pytest_addoption function for the repeat
argument and the pytest_report_header function is moved to
tests/http/conftest.py.

TODO: Remove repeat argument from all tests. As a stopgap, a
one-element list is defined for it for now.

Closes #14611

15 months agogtls: fix OCSP stapling management
Daniel Stenberg [Tue, 20 Aug 2024 14:14:39 +0000 (16:14 +0200)] 
gtls: fix OCSP stapling management

Reported-by: Hiroki Kurosawa
Closes #14642

15 months agobuild: make `CURL_FORMAT_CURL_OFF_T[U]` work with mingw-w64 <=7.0.0
Viktor Szakats [Wed, 21 Aug 2024 22:21:51 +0000 (00:21 +0200)] 
build: make `CURL_FORMAT_CURL_OFF_T[U]` work with mingw-w64 <=7.0.0

Add tweak for mingw-w64 when building tests/http/client programs to
avoid a bogus `-Wformat` warning when using mingw-w64 v7.0.0 or older.
The warning is bogus because these programs use curl's `printf()`
implementation that is guaranteed to support that format spec.

Add this for both CMake and autotools. (But only CMake is CI tested with
an old toolchain.)

Apply the workaround to `docs/examples`, and fix an example to use
curl's `printf()` with `CURL_FORMAT_CURL_OFF_T`.

Reintroduce curl `printf()` calls into `tests/http/client`, via #14625.
Also restore large number masks to a printf, changed earlier in #14382.

Follow-up to 232302f88a152a1d1722da9f69c383a766528918 #14382
Ref: https://github.com/curl/curl/pull/14625#issuecomment-2302361737

Closes #14640

15 months agosrc: fix potential macro confusion in cmake unity builds
Viktor Szakats [Wed, 21 Aug 2024 11:36:29 +0000 (13:36 +0200)] 
src: fix potential macro confusion in cmake unity builds

Sources used `lib/curlx.h` with both `ENABLE_CURLX_PRINTF` set and unset
before including it.

In a cmake "unity" batch where the first included source had it unset,
the next sources did not get the macros requested with
`ENABLE_CURLX_PRINTF` because `lib/curl.x` had already been included
without them.

Fix it by by making the macros enabled permanently and globally for
internal sources, and dropping `ENABLE_CURLX_PRINTF`.

This came up while testing unity builds with smaller batches. The full,
default unity build where all `src` is bundled up in a single unit, was
not affected.

Fixes:
```
$ cmake -B build -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=15
$ make -C build
...
curl/src/tool_getparam.c: In function ‘getparameter’:
curl/src/tool_getparam.c:2409:11: error: implicit declaration of function ‘msnprintf’; did you mean ‘vsnprintf’? [-Wimplicit-function-declaration]
 2409 |           msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-",
      |           ^~~~~~~~~
      |           vsnprintf
curl/src/tool_getparam.c:2409:11: warning: nested extern declaration of ‘msnprintf’ [-Wnested-externs]
[...]
```

Reported-by: Daniel Stenberg
Bug: https://github.com/curl/curl/pull/14626#issuecomment-2301663491

Closes #14632

15 months agoRELEASE-NOTES: synced
Daniel Stenberg [Thu, 22 Aug 2024 07:44:54 +0000 (09:44 +0200)] 
RELEASE-NOTES: synced

15 months agoCURLOPT_XFERINFOFUNCTION: clarify the callback return codes
Daniel Stenberg [Wed, 21 Aug 2024 21:35:31 +0000 (23:35 +0200)] 
CURLOPT_XFERINFOFUNCTION: clarify the callback return codes

also done in CURLOPT_PROGRESSFUNCTION.md

This changes the wording to say that 1 should be returned instad of
non-zero to return error from the callback. I did this to simplify, even
if other non-zero values still do the same thing I figure we might just
as well just leave out the others from the documentation.

Fixes #14627
Reported-by: Benjamin Riefenstahl Mecom
Closes #14637

15 months agolib: delete stray undefs for `vsnprintf`, `vsprintf`
Viktor Szakats [Wed, 21 Aug 2024 11:30:54 +0000 (13:30 +0200)] 
lib: delete stray undefs for `vsnprintf`, `vsprintf`

Stop #undefining macros that were not redefined or used in the code.

Closes #14631

15 months agocmake: tidy up option descriptions
Viktor Szakats [Wed, 21 Aug 2024 05:59:27 +0000 (07:59 +0200)] 
cmake: tidy up option descriptions

- capitalize.
- impartive voice.
- stick to `Build ...`, `Use ...`, `Enable ...`, `Disable ...` with
  a couple of exceptions.
- drop period.
- fix wolfSSH, WebSockets casing.

Closes #14636

15 months agocmake: honor custom `CMAKE_UNITY_BUILD_BATCH_SIZE`
Viktor Szakats [Wed, 21 Aug 2024 07:27:18 +0000 (09:27 +0200)] 
cmake: honor custom `CMAKE_UNITY_BUILD_BATCH_SIZE`

This value tells how many sources files to bundle in a single "unity"
compilation unit.

The CMake default is 8 sources, curl's CMake set this to 0, meaning
to bundle all sources into a single unit.

This patch makes it possible to override the 0 value, and potentially
optimize the build process further by better utilizing multiple cores
in conjunction with `make -jN`.

The number of sources in lib is 172 at the time of writing this. For
a 12-core CPU, this can give a job for them all:
`-DCMAKE_UNITY_BUILD_BATCH_SIZE=15`

(Compile time may be affected by a bunch of other factors.)

Closes #14626

15 months agoGHA/windows: fix indentation in the MSVC section
Viktor Szakats [Wed, 21 Aug 2024 14:13:04 +0000 (16:13 +0200)] 
GHA/windows: fix indentation in the MSVC section

15 months agosetopt: allow CURLOPT_INTERFACE to be set to NULL
Daniel Stenberg [Wed, 21 Aug 2024 09:07:06 +0000 (11:07 +0200)] 
setopt: allow CURLOPT_INTERFACE to be set to NULL

Ref: https://github.com/curl/curl/discussions/14299#discussioncomment-10393909
Regression from 3060557af702dd591 (shipped in 8.9.0)

Closes #14629

15 months agobuild: add `iphlpapi` lib for libssh on Windows
Viktor Szakats [Tue, 20 Aug 2024 21:10:31 +0000 (23:10 +0200)] 
build: add `iphlpapi` lib for libssh on Windows

vcpkg doesn't need it because it fixes this with a libssh patch.
All other Windows builds need it.

(autotools build not tested.)

Closes #14618

15 months agocmake: drop libssh CONFIG-style detection
Viktor Szakats [Tue, 20 Aug 2024 13:44:28 +0000 (15:44 +0200)] 
cmake: drop libssh CONFIG-style detection

Drop `find_package(libssh CONFIG)` detection method in favour of
the Find module that supports both `pkg-config`, and CMake-native
(since #14555) detection.

This aligns `libssh` detection with other dependencies. It makes the
build honor custom configuration via `LIBSSH_INCLUDE_DIR`,
`LIBSSH_LIBRARY`.

Also enable libssh in a GHA/macos cmake job for build coverage.

Fixing:
- curl-for-win requiring a hack to configure libssh:
  https://github.com/curl/curl-for-win/blob/4f9acbed92fd4aac0e874c9a591bec7d621cd9f2/curl.sh#L255-L263
- after #14555, GHA/windows gnutls vcpkg job no longer auto-detected
  libssh, due to a regression missing to enable libssh when
  found via `find_package(libssh CONFIG)`.
  Ref: https://github.com/curl/curl/actions/runs/10470138955/job/28994650338

Follow-up to 422696f0a4f3a9e20d4ba9f12726bb066f1c34fc #14555

Closes #14614

15 months agounit1300: fix checksrc longline warnings
Jay Satiro [Wed, 21 Aug 2024 06:30:50 +0000 (02:30 -0400)] 
unit1300: fix checksrc longline warnings

Closes https://github.com/curl/curl/pull/14624

15 months agohttp2: fix GOAWAY message sent to server
Jay Satiro [Wed, 21 Aug 2024 06:23:55 +0000 (02:23 -0400)] 
http2: fix GOAWAY message sent to server

- fix typo in GOAWAY debug message "shutown" -> "shutdown"

Closes https://github.com/curl/curl/pull/14623

15 months agobuildconf.bat: fix tool_hugehelp.c generation
Jay Satiro [Wed, 21 Aug 2024 05:25:14 +0000 (01:25 -0400)] 
buildconf.bat: fix tool_hugehelp.c generation

- Fix showhelp() function prototype in tool_hugehelp.c.cvs.

Follow-up to 9a0cf564 which added the function.

Closes https://github.com/curl/curl/pull/14622

15 months agocmake: fixup linking libgsasl when detected via CMake-native
Viktor Szakats [Wed, 21 Aug 2024 07:21:29 +0000 (09:21 +0200)] 
cmake: fixup linking libgsasl when detected via CMake-native

Found in local tests.

Follow-up to 422696f0a4f3a9e20d4ba9f12726bb066f1c34fc #14555
which added CMake-native detection.

15 months agotidy-up: spelling wolfSSL [ci skip]
Viktor Szakats [Wed, 21 Aug 2024 06:52:54 +0000 (08:52 +0200)] 
tidy-up: spelling wolfSSL [ci skip]

15 months agombedtls: fix incorrect macro condition mbed_dump_cert_info
Jan Venekamp [Tue, 20 Aug 2024 18:33:59 +0000 (20:33 +0200)] 
mbedtls: fix incorrect macro condition mbed_dump_cert_info

Follow-up to 88cae145509c7

15 months agodocs/SSLCERTS: rewrite
Daniel Stenberg [Tue, 20 Aug 2024 16:04:37 +0000 (18:04 +0200)] 
docs/SSLCERTS: rewrite

cleanup, modernize, refresh

Remove libcurl solutions, only do curl command lines.

Closes #14616

15 months agoGHA/macos: enable brotli and zstd in autotools and cmake jobs
Viktor Szakats [Tue, 20 Aug 2024 21:42:01 +0000 (23:42 +0200)] 
GHA/macos: enable brotli and zstd in autotools and cmake jobs

They were missing from macOS builds:
https://testclutch.curl.se/static/reports/feature-matrix.html

Closes #14619

15 months agoversion: fix shadowing a `libssh.h` symbol
Viktor Szakats [Tue, 20 Aug 2024 19:51:44 +0000 (21:51 +0200)] 
version: fix shadowing a `libssh.h` symbol

```
/Users/runner/work/curl/curl/lib/version.c: In function 'curl_version_info':
/Users/runner/work/curl/curl/lib/version.c:584:15: error: declaration of 'ssh_buffer' shadows a global declaration [-Werror=shadow]
  584 |   static char ssh_buffer[80];
      |               ^~~~~~~~~~
In file included from /Users/runner/work/curl/curl/lib/vssh/ssh.h:35,
                 from /Users/runner/work/curl/curl/lib/urldata.h:185,
                 from /Users/runner/work/curl/curl/lib/altsvc.c:32,
                 from /Users/runner/work/curl/curl/bld/lib/CMakeFiles/libcurl_shared.dir/Unity/unity_0_c.c:4:
/opt/homebrew/include/libssh/libssh.h:99:35: note: shadowed declaration is here
   99 | typedef struct ssh_buffer_struct* ssh_buffer;
      |                                   ^~~~~~~~~~
```
Ref: https://github.com/curl/curl/actions/runs/10477958747/job/29020250670#step:9:48

Tested via #14614

Closes #14617

15 months agossh: deduplicate SSH backend includes (and fix libssh cmake unity build)
Viktor Szakats [Tue, 20 Aug 2024 13:07:38 +0000 (15:07 +0200)] 
ssh: deduplicate SSH backend includes (and fix libssh cmake unity build)

For libssh, it fixes a "unity" build issue where libssh deprecation
warnings were not suppressed before this patch, because the suppression
macro was only set before just one of the two `libssh.h` includes.
If the other was compiled first in unity mode, the warnings appeared.

Seen in local curl-for-win build (`CW_CONFIG=test-x64-libssh-quictls`)
with libssh 0.11.0. (Also in a GHA/macos cmake job upcoming in #14614)

Use this opportunity to drop duplicate SSH header includes from the SSH
modules. It's enough to include them via the common `ssh.h` header.

Closes #14612

15 months agotidy-up: spelling 'built-in'
Viktor Szakats [Tue, 20 Aug 2024 13:34:26 +0000 (15:34 +0200)] 
tidy-up: spelling 'built-in'

Closes #14613

15 months agobuild: improve compiler version detection portability
Dan Fandrich [Tue, 20 Aug 2024 17:56:59 +0000 (10:56 -0700)] 
build: improve compiler version detection portability

POSIX sed doesn't support extended regular expressions, so convert a
call to the basic format. This caused a problem on AIX. Also, use the
detected sed binary name instead of hard-coding one.

15 months agoGHA/windows: add missing time limit for msys2 autotools test runs
Viktor Szakats [Tue, 20 Aug 2024 13:59:32 +0000 (15:59 +0200)] 
GHA/windows: add missing time limit for msys2 autotools test runs

The new mingw job (the first msys2/mingw job to run tests) is seen
hanging frequently.

Follow-up to 9f23c8f201f55f1a148b41b16a5e71f3385faa5e #14541

15 months agotests: add test_17_09_ssl_min_max
Jan Venekamp [Tue, 20 Aug 2024 00:53:26 +0000 (02:53 +0200)] 
tests: add test_17_09_ssl_min_max

Test setting all combinations of --tlsv1.x and --tls-max.

Closes #14590

15 months agotests: improve test_17_07_ssl_ciphers
Jan Venekamp [Tue, 20 Aug 2024 00:53:19 +0000 (02:53 +0200)] 
tests: improve test_17_07_ssl_ciphers

Change TLS proto version on the test httpd server to test setting
combinations of --tls13-ciphers and --ciphers.

To not let the changed config of the httpd server bleed into the next
test, clean and reload on each test. Because a reload is slow, only
do this if the config is different than the loaded config. For this
the httpd.reload_if_config_changed() method is added.

Overloading of autouse fixtures does not seem to work. For the test
httpd server to be reloaded with a clean config in test_18_methods,
to not be affected by the config changes in test_17_ssl_use, the two
class scope fixtures of test_18_methods are now combined.

Closes #14589

15 months agombedtls: no longer use MBEDTLS_SSL_VERIFY_OPTIONAL
Jan Venekamp [Mon, 19 Aug 2024 01:59:08 +0000 (03:59 +0200)] 
mbedtls: no longer use MBEDTLS_SSL_VERIFY_OPTIONAL

With mbedTLS if the minimum version of TLS is set to 1.3,
MBEDTLS_SSL_VERIFY_OPTIONAL is not available in client mode. See:
https://github.com/Mbed-TLS/mbedtls/blob/2ca6c285/library/ssl_tls.c#L1357
Also, there might be plans to remove it completely in future mbedTLS
versions.

Switch to always use MBEDTLS_SSL_VERIFY_REQUIRED. If verifypeer or
verifyhost are disabled the corresponding error flags are cleared in the
verify callback function. That is also where verification errors are
logged.

Closes #14591

15 months agoGHA: update github/codeql-action digest to 883d858
renovate[bot] [Mon, 19 Aug 2024 21:21:56 +0000 (21:21 +0000)] 
GHA: update github/codeql-action digest to 883d858

Closes #14608

15 months agocmake: migrate dependency detections to Find modules
Viktor Szakats [Mon, 19 Aug 2024 12:27:51 +0000 (14:27 +0200)] 
cmake: migrate dependency detections to Find modules

For: libgsasl, libidn2, libssh, libuv.

The new Find modules retain using `pkg-config` natively, not as a "hint"
for the CMake-native detection. Of the pre-existing Find modules, only
FindNettle, and FindGSS (with customized code) work this way. Align
detection code for the new modules and add version detection for the
CMake-native paths.

Also, add CMake-native detection for `libgsasl`.

The remaining outlier in `CMakeLists.txt` is GnuTLS, which has
a CMake built-in Find module, but which lacks `pkg-config` support,
required for vcpkg. It remains unchanged.

Another part-outlier is `libssh`, which keeps requiring the trick
`find_package(libssh CONFIG QUIET)` for reasons I could not yet figure
out.

Closes #14555

15 months agocmake: add `find_package()` missing from `USE_MSH3` option
Viktor Szakats [Mon, 19 Aug 2024 23:13:14 +0000 (01:13 +0200)] 
cmake: add `find_package()` missing from `USE_MSH3` option

The original patch added the Find module and CMake option. But the logic
missed a `find_package(MSH3)` call to use that Find module, leaving the
referenced `MSH3_INCLUDE_DIRS`, `MSH3_LIBRARIES` variables undefined.

Blind fix.

Follow-up to 37492ebbfa24ba4e700e6655b3dbc2bdd65c894a #8517

Closes #14609

15 months agocf-socket: prevent KEEPALIVE_FACTOR being set to 1000 for Windows
Sam Jessup [Mon, 19 Aug 2024 15:37:59 +0000 (17:37 +0200)] 
cf-socket: prevent KEEPALIVE_FACTOR being set to 1000 for Windows

Fixes #14368
Reported-by: feelingseas on github
Closes #14606

15 months agocurl: find curlrc in XDG_CONFIG_HOME without leading dot
Daniel Stenberg [Mon, 19 Aug 2024 21:22:56 +0000 (23:22 +0200)] 
curl: find curlrc in XDG_CONFIG_HOME without leading dot

If XDG_CONFIG_HOME is set, look for XDG_CONFIG_HOME/curlrc - without a
leading dot in the filename.

Fixes #12129
Reported-by: Jat Satiro
Closes #14600

15 months agoGHA/windows: unblock TFTP MQTT WebSockets SMTP FTP tests
Viktor Szakats [Mon, 19 Aug 2024 17:05:36 +0000 (19:05 +0200)] 
GHA/windows: unblock TFTP MQTT WebSockets SMTP FTP tests

Run them now. Also ignore results for now.

Closes #14607

15 months agocmake: limit `pkg-config` to UNIX and MSVC+vcpkg by default
Viktor Szakats [Fri, 16 Aug 2024 23:08:45 +0000 (01:08 +0200)] 
cmake: limit `pkg-config` to UNIX and MSVC+vcpkg by default

Limits `pkg-config` to UNIX and MSVC with vcpkg, by default. Compared to
curl 8.9.1, this unlocks `pkg-config` on MSVC with vcpkg.

This condition might be updated in the future depending on where
`pkg-config` can be useful without breaking things. (e.g. to non-cross
MINGW, or all MINGW).

In the meantime everyone is free to override the default and test their
build with `pkg-config` by setting the `CURL_USE_PKGCONFIG=ON` CMake
option.

Closes #14575

15 months agocmake: rename Find modules
Viktor Szakats [Mon, 19 Aug 2024 22:47:55 +0000 (00:47 +0200)] 
cmake: rename Find modules

- `FindCARES`   -> `FindCares`
- `FindLibPSL`  -> `FindLibpsl`
- `FindLibSSH2` -> `FindLibssh2`
- `FindQUICHE`  -> `FindQuiche`
- `Findrustls`  -> `FindRustls`

Our convention for naming Find modules (the part after the `Find`
prefix, also called as 'package name') is:

Always start with uppercase. Follow with lowercase, unless there is
a clear preference for a stylized name. E.g. the project itself uses it
that way with a matching `<Name>Config.cmake` file, or we use it that
way elsewhere, or the name is an acronym.

Ref: #14580

Closes #14601

15 months agocmake: fix Find module and package names
Viktor Szakats [Mon, 19 Aug 2024 10:31:11 +0000 (12:31 +0200)] 
cmake: fix Find module and package names

- fix BearSSL warning about name mismatch.
- fix Nettle Find module not found on Linux.
- tidy-up: drop quotes from a package name.

Package names must match case-sensitively to work on all platforms:
- `find_package(<NAME> ...)` in `CMakeLists.txt`.
- `CMake/Find<NAME>.cmake` filenames.
- `find_package_handle_standard_args(<NAME> ...` in Find modules.
- `message(STATUS "Found <NAME> ...` in Find modules.
  (to match the message shown by `find_package_handle_standard_args()`)

Closes #14599

15 months agotidy-up: spelling quiche and Rustls
Viktor Szakats [Mon, 19 Aug 2024 14:53:40 +0000 (16:53 +0200)] 
tidy-up: spelling quiche and Rustls

Closes #14605

15 months agotidy-up: adjust casing of project names (continued)
Viktor Szakats [Mon, 19 Aug 2024 13:08:37 +0000 (15:08 +0200)] 
tidy-up: adjust casing of project names (continued)

Replace remaining `LibSSH2` with `libssh2`.

Follow-up to 6343034dd12fabfa88c998eb1182cbc6394afe25 #14160

Closes #14602

15 months agopingpong: drain the input buffer when reading responses
Daniel Stenberg [Mon, 19 Aug 2024 10:00:15 +0000 (12:00 +0200)] 
pingpong: drain the input buffer when reading responses

As the data might be held by TLS buffers, leaving some and expecting to
get called again is error prone.

Reported-by: ralfjunker on github
Fixes #14201
Closes #14597

15 months agoKNOWN_BUGS: Heimdal memory leaks
Daniel Stenberg [Mon, 19 Aug 2024 14:39:44 +0000 (16:39 +0200)] 
KNOWN_BUGS: Heimdal memory leaks

Closes #14446
Closes #14604

15 months agobuild: use -Wno-format-overflow
Daniel Stenberg [Mon, 19 Aug 2024 12:17:55 +0000 (14:17 +0200)] 
build: use -Wno-format-overflow

-Wformat-overflow is not a warning that we want enabled as it does not
help us. It can only bring us false positives since it warns on bad uses
of sprintf and vsprintf ("that might overflow the destination buffer").
Two functions we explicitly ban in curl code.

The only way this flag triggers warnings in curl code is false positives
for functions we have marked with the CURL_PRINTF() macro.

Further: it seems -Wformat-trunaction option might in turn also enable
-Wformat-overflow, so if this second option is used, we need to
explicitly set -Wno-format-overflow - not just skip setting
-Wformat-overflow.

Reported-by: Viktor Szakats
Fixes #14168
Closes #14598

15 months agocmake/FindNettle: log message when found via `pkg-config`
Viktor Szakats [Wed, 14 Aug 2024 21:27:33 +0000 (23:27 +0200)] 
cmake/FindNettle: log message when found via `pkg-config`

The message mimics the CMake-native message (by
`find_package_handle_standard_args()`), with the header path and version number.

Closes #14596

15 months agocmake: adjust GSSAPI option description
Viktor Szakats [Mon, 19 Aug 2024 09:12:15 +0000 (11:12 +0200)] 
cmake: adjust GSSAPI option description

krb5 also builds with CMake, not only Heimdal.

Ref: 558814e16d84aa202c5ccc0c8108a9d728e77a58

Closes #14595

15 months agoCI/azure: disable parallel tests, allow IDN tests
Viktor Szakats [Mon, 19 Aug 2024 07:28:17 +0000 (09:28 +0200)] 
CI/azure: disable parallel tests, allow IDN tests

They started show the similar flakiness as the GHA ones after enabling
parallel tests (`-j2`) by default.

Example flaky run:
https://dev.azure.com/daniel0244/curl/_build/results?buildId=24763&view=results

Ubuntu:
```
FAIL 137: 'FTP download without size in RETR string' FTP, RETR, --data-binary
FAIL 336: 'FTP range download when SIZE doesn't work' FTP, PASV, TYPE A, RETR
FAIL 975: 'HTTP with auth redirected to FTP allowing auth to continue' HTTP, FTP, --location-trusted
FAIL 1378: 'FTP DL, file without Content-Disposition inside, using -o fname' FTP, RETR
```

MSYS2 mingw32:
```
FAIL 1501: 'FTP with multi interface and slow LIST response' FTP, RETR, multi, LIST, DELAY
```

MSYS2 mingw64:
```
FAIL 1501: 'FTP with multi interface and slow LIST response' FTP, RETR, multi, LIST, DELAY
```

Follow-up to 0324d557e4b4f754ea89636ea9164065f6446560 #11510

Closes #14593

15 months agocmake/FindNettle: skip `pkg-config` for custom configs
Viktor Szakats [Sat, 17 Aug 2024 22:10:39 +0000 (00:10 +0200)] 
cmake/FindNettle: skip `pkg-config` for custom configs

If either `NETTLE_INCLUDE_DIR` or `NETTLE_LIBRARY` is set to customize
the `nettle` dependency, skip `pkg-config` and use the CMake-native
detection to honor these custom settings.

Closes #14584

15 months agombedtls: fix setting tls version
Jan Venekamp [Mon, 19 Aug 2024 01:59:02 +0000 (03:59 +0200)] 
mbedtls: fix setting tls version

TLS max values lower than 1.2 were automatically set to 1.2. Other SSL
backends (that dropped TLS 1.0 and 1.1) do not do that.

Closes #14588

15 months agowolfssl: fix setting tls version
Jan Venekamp [Mon, 19 Aug 2024 02:00:43 +0000 (04:00 +0200)] 
wolfssl: fix setting tls version

The value CURL_SSLVERSION_TLSv1_0 was unsupported.

Closes #14587

15 months agorustls: fix setting tls version
Jan Venekamp [Mon, 19 Aug 2024 02:02:12 +0000 (04:02 +0200)] 
rustls: fix setting tls version

The value CURL_SSLVERSION_TLSv1_0 was unsupported.

Closes #14586

15 months agobearssl: fix setting tls version
Jan Venekamp [Mon, 19 Aug 2024 02:03:16 +0000 (04:03 +0200)] 
bearssl: fix setting tls version

Previously version_max was ignored.

Closes #14585

15 months agoRELEASE-NOTES: synced
Daniel Stenberg [Sun, 18 Aug 2024 20:57:25 +0000 (22:57 +0200)] 
RELEASE-NOTES: synced

15 months agocmake: fix `cmakelint` warnings
Viktor Szakats [Sun, 18 Aug 2024 11:59:31 +0000 (13:59 +0200)] 
cmake: fix `cmakelint` warnings

- keep line lengths below 132 characters.
- fix two "weird indentation" warnings.

Reported-by: Dan Fandrich
Bug: #14580

Closes #14583

15 months agocmake: tidy up more in Find modules
Viktor Szakats [Sat, 17 Aug 2024 21:39:49 +0000 (23:39 +0200)] 
cmake: tidy up more in Find modules

- add `NAMES` where missing.
- document input variables (including deprecated ones.)
- comment cleanups.
- FindWolfSSL: drop stray `QUIET` from `pkg_check_modules()`.
  (`QUIET` may be re-added for all modules in the future.)

Closes #14579

15 months agoappveyor: drop uploading artifacts
Viktor Szakats [Sun, 18 Aug 2024 07:26:22 +0000 (09:26 +0200)] 
appveyor: drop uploading artifacts

Uploading artifacts sometimes results in this error:
```
Uploading artifacts...
[1/1] _bld\src\curl.exe (2,022,912 bytes)...100%
Error uploading artifact to the storage: Remote server returned 503: Service Temporarily Unavailable
```
Ref: https://ci.appveyor.com/project/curlorg/curl/builds/50424126/job/e4envval6xkicv1i#L123

The artifacts are also probably not useful to upload for every run. Also
note that they were missing external DLL dependencies.

Leave the logic there commented, to make it easy to enable as needed for
debugging or testing artifacts locally.

Closes #14581

15 months agocmake: tidy up around ngtcp2 and wolfSSL
Viktor Szakats [Fri, 16 Aug 2024 23:41:23 +0000 (01:41 +0200)] 
cmake: tidy up around ngtcp2 and wolfSSL

- fix to add the `m` library without path.
  Follow-up to 8577f4ca084b8a3926b869a48a29d41a810eceb5 #14343
Authored-by: Tal Regev
  Fixes #14549

- move `m` library detection to wolfSSL Find module.
  `m` is necessary for wolfSSL (wolfcrypt) library functions called by
  `libngtcp2_crypto_wolfssl`.
  Follow-up to 8577f4ca084b8a3926b869a48a29d41a810eceb5 #14343

- fix comment header about supported `COMPONENT` names.

- quote strings.

- lowercase local variables.

Closes #14576

15 months agocmake: do not unset the deprecated mixed-case variables
Viktor Szakats [Sat, 17 Aug 2024 20:45:38 +0000 (22:45 +0200)] 
cmake: do not unset the deprecated mixed-case variables

To avoid interference with the calling env.

(Keep unsetting for the DIRS/DIR cases in BearSSL and mbedTLS, because
the deprecated variables play a new role in the detection.)

Follow-up to 9fbda4ca75483ee0a43289526e88d8f1e8ca2a78 #14574

15 months agocmake: rename wolfSSL and zstd config variables to uppercase
Viktor Szakats [Fri, 16 Aug 2024 16:56:49 +0000 (18:56 +0200)] 
cmake: rename wolfSSL and zstd config variables to uppercase

To match with other config variables and other projects.

Rename these CMake configuration variables:
- `WolfSSL_INCLUDE_DIR` -> `WOLFSSL_INCLUDE_DIR`
- `WolfSSL_LIBRARY`     -> `WOLFSSL_LIBRARY`
- `Zstd_INCLUDE_DIR`    -> `ZSTD_INCLUDE_DIR`
- `Zstd_LIBRARY`        -> `ZSTD_LIBRARY`

The old values continue to work, with a warning suggesting the new name.

Also:
- add similar warnings for earlier renames for mbedTLS and BearSSL.
- rename internal variables `PC_Zstd_*` to uppercase.

Follow-up to db39c668a8e33e064b9eb20892cd027f46302f77 #14542

Closes #14574

15 months agolocation: fix typo
Daniel Stenberg [Sat, 17 Aug 2024 19:04:34 +0000 (21:04 +0200)] 
location: fix typo

Follow-up to 5fcf96930efc
Bug: https://github.com/curl/curl/pull/14471#pullrequestreview-2244131475
Reported-by: Joshix-1 on github
15 months agodocs: add description of effect of --location-trusted on cookie
XYenon [Fri, 9 Aug 2024 09:30:40 +0000 (17:30 +0800)] 
docs: add description of effect of --location-trusted on cookie

Closes #14471

15 months agodocs: improve cipher options documentation
Jan Venekamp [Fri, 16 Aug 2024 09:45:26 +0000 (11:45 +0200)] 
docs: improve cipher options documentation

Closes #14407

15 months agoGHA: update github/codeql-action digest to 429e197
renovate[bot] [Wed, 14 Aug 2024 16:54:43 +0000 (16:54 +0000)] 
GHA: update github/codeql-action digest to 429e197

Closes #14425

15 months agoSECURITY: mention OpenSSF best practices gold badge
Viktor Petersson [Tue, 30 Jul 2024 17:24:13 +0000 (18:24 +0100)] 
SECURITY: mention OpenSSF best practices gold badge

Closes #14319

15 months agombedtls: add more informative logging
Justin Maggard [Mon, 5 Aug 2024 17:21:35 +0000 (10:21 -0700)] 
mbedtls: add more informative logging

After TLS handshare, indicate which TLS version was negotiated in
addition to the cipher in the handshake completed log message.

Also use the verify callback for certificate logging and collection.
This allows things to work even when MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
is disabled in the mbedtls library.

And lastly, catch certificate validation errors later so we can give the
user more informative error messages that indicate what the failure was
from certificate validation.

Tested on both current LTS versions (2.28 and 3.6).

Closes #14444

15 months agoGHA: update dependency gnutls/gnutls to v3.8.7
renovate[bot] [Thu, 15 Aug 2024 08:18:03 +0000 (08:18 +0000)] 
GHA: update dependency gnutls/gnutls to v3.8.7

Closes #14554

15 months agotransfer: Curl_sendrecv() and event related improvements
Stefan Eissing [Thu, 15 Aug 2024 11:16:53 +0000 (13:16 +0200)] 
transfer: Curl_sendrecv() and event related improvements

- Renames Curl_readwrite() to Curl_sendrecv() to reflect that it
  is mainly about talking to the server, not reads or writes to the
  client. Add a `nowp` parameter since the single caller already
  has this.
- Curl_sendrecv() now runs all possible operations whenever it is
  called and either it had been polling sockets or the 'select_bits'
  are set.
  POLL_IN/POLL_OUT are not always directly related to send/recv
  operations. Filters like HTTP/2, QUIC or TLS may monitor reverse
  directions. If a transfer does not want to send (KEEP_SEND), it
  will not do so, as before. Same for receives.
- Curl_update_timer() now checks the absolute timestamp of an expiry
  and the last/new timeout to determine if the application needs
  to stop/start/restart its timer. This fixes edge cases where
  updates did not happen as they should have.
- improved --test-event curl_easy_perform() simulation to handle
  situations where no sockets are registered but a timeout is
  in place.
- fixed bug in events_socket() that complained about removing
  a socket that was unknown, when indeed it had removed the socket
  just before, only it was the last in the list
- fixed conncache's internal handle to carry the multi instance
  (where the cache has one) so that operations on the closure handle
  trigger event callbacks correctly.
- fixed conncache to not POLL_REMOVE a socket twice when a conneciton
  was closed.

Closes #14561

15 months agocmake: sync up version detection in Find modules
Viktor Szakats [Fri, 16 Aug 2024 13:04:25 +0000 (15:04 +0200)] 
cmake: sync up version detection in Find modules

- use the same pattern across all Find modules:
  - verify if the version header exists before reading it.
  - use a single regex per lookup.
  - sync regexes between Find modules.
  - use generic temporary variable names.
  - improve readability.
  - make it simpler to transition to new CMake syntax in the future:
    ```cmake
    file(STRINGS "${CARES_INCLUDE_DIR}/ares_version.h" _version_str REGEX "<...>")
    unset(_version_str)
    set(CARES_VERSION "${CMAKE_MATCH_1}")
    ```
    Ref: https://cmake.org/cmake/help/latest/policy/CMP0159.html#policy:CMP0159

- fix zstd version detection to be CMake 3.7 compatible.
  Required 3.9 before this patch, for the `CMAKE_MATCH_<n>` feature.
  Follow-up to c5d506e9bbf0669d7605d1d00865ae7e229b2409 #12200

Follow-up to 4e2f3641f80e233738147d82218317f331369c50 #14548

Closes #14572

15 months agocmake: tidy-up continues
Viktor Szakats [Thu, 15 Aug 2024 08:47:54 +0000 (10:47 +0200)] 
cmake: tidy-up continues

- move variable dump to a GHA foldable group.
- minimize scope for an include().
- rename `HIDES_CURL_PRIVATE_SYMBOLS` to `CURL_HIDES_PRIVATE_SYMBOLS`,
  to keep it in the curl namespace.
- drop quotes from a version number.
- add missing `Makefile.inc` var refs to comment.
- FindNGTCP2: rename internal var to underscore/lowercase.
- FindBearSSL, FindGSS: whitespace.

Closes #14571

15 months agocmake: revert to `pkg_check_modules()`
Viktor Szakats [Fri, 16 Aug 2024 16:19:25 +0000 (18:19 +0200)] 
cmake: revert to `pkg_check_modules()`

Prefer `pkg_check_modules()` over `pkg_search_module()`.

`pkg_check_modules()` logs a line when there is a hit, and also warnings
if a sub-dependency is missing. In `QUIET` mode, both are silent.

The extra info is useful to see if a detection happened via
`pkg-config`.

Keep `pkg_search_module()` in `FindGSS`. We pass two dependencies
there and we want to keep stopping on the first one.

Partially reverts c2889a7b4180fc963ae30811f59ab547b6eb03cd #14388

Closes #14573

15 months agocmake: fixup variable reference in FindZstd
Viktor Szakats [Fri, 16 Aug 2024 17:09:08 +0000 (19:09 +0200)] 
cmake: fixup variable reference in FindZstd

Follow-up to 4e2f3641f80e233738147d82218317f331369c50 #14548

15 months agointernals/SPLAY.md: internal API documentation
Daniel Stenberg [Thu, 15 Aug 2024 14:18:30 +0000 (16:18 +0200)] 
internals/SPLAY.md: internal API documentation

Closes #14563

15 months agocurl: make the progress bar detect terminal width changes
Daniel Stenberg [Fri, 16 Aug 2024 09:15:36 +0000 (11:15 +0200)] 
curl: make the progress bar detect terminal width changes

And up the widest supported bar to 400 columns.

Fixes #14565
Reported-by: lolbinarycat on github
Closes #14570

15 months agocmake: add missing version detection to Find modules
Viktor Szakats [Tue, 13 Aug 2024 20:59:50 +0000 (22:59 +0200)] 
cmake: add missing version detection to Find modules

- use `pkg-config` version when available and where it wasn't yet used.

- add manual version detection for dependencies where this is possible
  (via a public header) and where it wasn't done yet.

Closes #14548

15 months agoGHA/windows: delete redundant options, tidy up
Viktor Szakats [Fri, 16 Aug 2024 08:42:45 +0000 (10:42 +0200)] 
GHA/windows: delete redundant options, tidy up

- delete redundant `-DCURL_USE_LIBPSL=ON`.

- delete redundant `-DUSE_NGHTTP2=ON`.
  Follow-up to 87aa4ebd821ebae0023df8658360c724efcf5e00 #14136

- reorder options.

Closes #14569

15 months agotidy-up: misc build, tests, `lib/macos.c`
Viktor Szakats [Thu, 15 Aug 2024 08:47:37 +0000 (10:47 +0200)] 
tidy-up: misc build, tests, `lib/macos.c`

- mkhelp.pl: drop unused assigment.
- Makefile.mk: update a comment.
- lib/macos.c: delete redundant block.
- fix two typos.

Closes #14558

15 months agoRELEASE-NOTES: synced
Daniel Stenberg [Fri, 16 Aug 2024 12:52:34 +0000 (14:52 +0200)] 
RELEASE-NOTES: synced

15 months agodocs: remove ALTSVC.md, HSTS.md, HTTP2.md and PARALLEL-TRANSFERS.md
Daniel Stenberg [Thu, 15 Aug 2024 08:04:03 +0000 (10:04 +0200)] 
docs: remove ALTSVC.md, HSTS.md, HTTP2.md and PARALLEL-TRANSFERS.md

These are files and documentation for established functionality that
should by now be covered properly and completely in the standard
documentation and in everything curl. Having these extra files provides
duplicated information where they risk being out of sync.

Closes #14553

15 months agorustls: add support for setting TLS version and ciphers
Jan Venekamp [Tue, 13 Aug 2024 20:01:07 +0000 (22:01 +0200)] 
rustls: add support for setting TLS version and ciphers

Add support for CURLOPT_SSLVERSION, CURLOPT_TLS13_CIPHERS and
CURLOPT_SSL_CIPHER_LIST.

Closes #14535

15 months agocmake: add wolfSSH support
Viktor Szakats [Thu, 15 Aug 2024 21:38:10 +0000 (23:38 +0200)] 
cmake: add wolfSSH support

Enable with CMake option `-DCURL_USE_WOLFSSH=ON`. Customize with
`-DWOLFSSH_INCLUDE_DIR=<path-to-wolfssh>/include`,
`-DWOLFSSH_LIBRARY=<path-to-wolfssh>/lib/libwolfssh.a`.

It requires the wolfSSL TLS backend.

Closes #14568

15 months agocmake: TLS 1.3 warning only for bearssl and sectranp
Jan Venekamp [Thu, 15 Aug 2024 18:11:35 +0000 (20:11 +0200)] 
cmake: TLS 1.3 warning only for bearssl and sectranp

Closes #14566

15 months agosplay: use access functions, add asserts, use Curl_timediff
Daniel Stenberg [Thu, 15 Aug 2024 14:13:23 +0000 (16:13 +0200)] 
splay: use access functions, add asserts, use Curl_timediff

- add set/get functions for the custom data in a tree node

- use Curl_timediff for time comparisons instead of the custom macro, as they
  do the exact same things.

- add asserts to catch mistakes better

- updated test 1309 accordingly

Closes #14562

15 months agoscorecard: tweak request measurements
Stefan Eissing [Thu, 15 Aug 2024 14:52:40 +0000 (16:52 +0200)] 
scorecard: tweak request measurements

Increase max-parallel up to 300, the curl max

Tweak output to just give the http response code

Closes #14564

15 months agodocs/internals: new subdirectory
Daniel Stenberg [Thu, 15 Aug 2024 12:05:23 +0000 (14:05 +0200)] 
docs/internals: new subdirectory

For libcurl internal APIs and concepts.

Closes #14552

15 months agotest1707: output diff more for debugging differences in CI outputs
Daniel Stenberg [Thu, 15 Aug 2024 22:19:00 +0000 (00:19 +0200)] 
test1707: output diff more for debugging differences in CI outputs

15 months agomanagen: wordwrap long example lines in ASCII output
Daniel Stenberg [Wed, 14 Aug 2024 11:36:20 +0000 (13:36 +0200)] 
managen: wordwrap long example lines in ASCII output

The entire ASCII version of the manpage word wraps at a fixed column,
while example command lines can easily go wider than so.

This change now makes manage work on wrapping long example command lines
to make them look nicer. And also to avoid triggering the build error
caused by too long lines in the output.

Quoted lines cannot be wrapped, so managen now errors out if they are
"too long". With this addition, the 'maxline' script is removed as it is
no longer needed.

Closes #14543

15 months agocmake: fix find rustls
Jan Venekamp [Thu, 15 Aug 2024 18:43:33 +0000 (20:43 +0200)] 
cmake: fix find rustls

Follow-up to 2784801977e81f68c6f87f9509e64f332d74acab #14545
Closes #14567

15 months agomulti: on socket callback error, remove socket hash entry nonetheless
Daniel Stenberg [Thu, 15 Aug 2024 09:06:38 +0000 (11:06 +0200)] 
multi: on socket callback error, remove socket hash entry nonetheless

Previously an error from the callback accidentally made libcurl keep the
hash entry which would lead to the entry remaining and then potentially
getting removed *again* which would lead to internal confusions.

This is an old issue (introduced in 2b3dd01b779e4eff6), caught by the new
asserts from c0233a35da81.

Closes #14557

15 months agolibcurl.pc: add reference to `libgsasl`
Viktor Szakats [Thu, 15 Aug 2024 08:41:02 +0000 (10:41 +0200)] 
libcurl.pc: add reference to `libgsasl`

Closes #14556

15 months agotidy-up: misc spelling (bit, ASCII)
Viktor Szakats [Thu, 15 Aug 2024 09:00:04 +0000 (11:00 +0200)] 
tidy-up: misc spelling (bit, ASCII)

Closes #14559

15 months agotests: move the disabling of 500 for hyper from CI to DISABLED
Daniel Stenberg [Thu, 15 Aug 2024 07:04:28 +0000 (09:04 +0200)] 
tests: move the disabling of 500 for hyper from CI to DISABLED

Follow-up to 136504195ae63

Closes #14551