diff options
| author | dartraiden <wowemuh@gmail.com> | 2022-07-02 23:09:35 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2022-07-02 23:09:35 +0300 |
| commit | 5882ac58f5d5cbcfa9f9d4015285d4f5d2b7c755 (patch) | |
| tree | ab1c3cd0b9893ecfef62702fbb9811f610b8b224 /libs/libcurl | |
| parent | 59efa751fe2e8189c625b67d9c98b7155e59022e (diff) | |
libcurl: update to 7.84.0
Diffstat (limited to 'libs/libcurl')
338 files changed, 5783 insertions, 4039 deletions
diff --git a/libs/libcurl/docs/CHANGES b/libs/libcurl/docs/CHANGES index 25ab5236b6..1653a55c98 100644 --- a/libs/libcurl/docs/CHANGES +++ b/libs/libcurl/docs/CHANGES @@ -6,59 +6,1781 @@ Changelog +Version 7.84.0 (27 Jun 2022) + +Daniel Stenberg (27 Jun 2022) +- RELEASE-NOTES: synced + + Version 7.84.0 release + +- THANKS: contributors from 7.84.0 release notes + +- hsts: use Curl_fopen() + +- altsvc: use Curl_fopen() + +- fopen: add Curl_fopen() for better overwriting of files + + Bug: https://curl.se/docs/CVE-2022-32207.html + CVE-2022-32207 + Reported-by: Harry Sintonen + Closes #9050 + +- test444: test many received Set-Cookie: + + The amount of sent cookies in the test is limited to 80 because hyper + has its own strict limits in how many headers it allows to be received + which triggers at some point beyond this number. + +- test442/443: test cookie caps + + 442 - verify that only 150 cookies are sent + 443 - verify that the cookie: header remains less than 8K in size + +- cookie: apply limits + + - Send no more than 150 cookies per request + - Cap the max length used for a cookie: header to 8K + - Cap the max number of received Set-Cookie: headers to 50 + + Bug: https://curl.se/docs/CVE-2022-32205.html + CVE-2022-32205 + Reported-by: Harry Sintonen + Closes #9048 + +- test387: verify rejection of compression chain attack + +- content_encoding: return error on too many compression steps + + The max allowed steps is arbitrarily set to 5. + + Bug: https://curl.se/docs/CVE-2022-32206.html + CVE-2022-32206 + Reported-by: Harry Sintonen + Closes #9049 + +- krb5: return error properly on decode errors + + Bug: https://curl.se/docs/CVE-2022-32208.html + CVE-2022-32208 + Reported-by: Harry Sintonen + Closes #9051 + +- easy_lock.h: remove use of the deprecated ATOMIC_VAR_INIT macro + + clang 14 warns about its use. It is being deprecated by the working + group for the programming language C: "The macro ATOMIC_VAR_INIT is + basically useless for the purpose for which it was designed" + + Ref: https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2886.htm + + Reported-by: Tatsuhiro Tsujikawa + Fixes #9041 + Closes #9042 + +- [Stefan Eissing brought this change] + + ngtcp2: avoid supplying 0 length `msg_control` to sendmsg() + + Testing on macOS 12.4, sendmsg() fails with EINVAL when a msg_control + buffer is provided in sengmsg(), even though msg_controllen was set to + 0. + + Initialize msg.msg_controllen just as needed and also perform the size + assertion only when needed. + + Closes #9039 + +- [Tom Eccles brought this change] + + ftp: restore protocol state after http proxy CONNECT + + connect_init() (lib/http_proxy.c) swaps out the protocol state while + working on the proxy connection, this is then restored by + Curl_connect_done() after the connection completes. + + ftp_do_more() extracted the protocol state pointer to a local variable + at the start of the function then calls Curl_proxy_connect(). If the proxy + connection completes, Curl_proxy_connect() will call Curl_connect_done() + (via Curl_proxyCONNECT()), which restores data->req.p to point to the ftp + protocol state instead of the http proxy protocol state, but the local + variable in ftp_do_more still pointed to the old value. + + Ultimately this meant that the state worked on by ftp_do_more() was the + http proxy state not the ftp state initialised by ftp_connect(), but + subsequent calls to any ftp_ function would use the original state. + + For my use-case, the visible consequence was that ftp->downloadsize was + never set and so downloaded data was never returned to the application. + + This commit updates the ftp protocol state pointer in ftp_do_more() after + Curl_proxy_connect() returns, ensuring that the correct state pointer is + used. + + Fixes #8737 + Closes #9043 + +Jay Satiro (23 Jun 2022) +- THANKS: add contributor missing from aea8ac1 + + aea8ac1 fixed #8980 which was reported by Sgharat on github, but that + info was not included in the commit message. + +- curl_setup: include _mingw.h + + Prior to this change _mingw.h needed to be included in each unit before + evaluating __MINGW{32,64}_xxx_VERSION macros since it defines them. It + is included only in some mingw headers (eg stdio.h) and not others + (eg windows.h) so it's better to explicitly include it once. + + Closes https://github.com/curl/curl/pull/9036 + +Viktor Szakats (22 Jun 2022) +- rand: stop detecting /dev/urandom in cross-builds + + - Prevent CMake to auto-detect /dev/urandom when cross-building. + Before this patch, it would detect it in a cross-build scenario on *nix + hosts with this device present. This was a problem for example with + Windows builds, but it could affect any target system with this device + missing. This also syncs detection behaviour with autotools, which also + skips it for cross-builds. + - Also, make sure to never use the file RANDOM_FILE as entropy for libcurl's + fallback random number generator on Windows. Windows does not have the + concept of reading a random stream from a filename, nor any guaranteed + non-world-writable path on disk. With this, a manual misconfiguration or + an overeager auto-detection can no longer result in a user-controllable + seed source. + + Reviewed-by: Daniel Stenberg + Closes #9038 + +Daniel Stenberg (22 Jun 2022) +- [Emanuele Torre brought this change] + + ci: avoid `cmake -Hpath` + + This is an undocumented option similar to the `-Spath' option introduced + in cmake 3.13. + Replace all instances of `-Hpath' with `-Spath' in macos workflow. + Replace `-H. -Bpath' with `mkdir path; cd ./path; cmake ..' in zuul + scripts since it runs an older version of cmake. + + Fixes #9008 + Closes #9014 + +- INTERNALS: bring back the "Library symbols" section + + Most contents was moved, but this text should remain here. + + Follow-up to: d324ac8 + Reported-by: Viktor Szakats + Bug: https://github.com/curl/curl/pull/9027#discussion_r903382326 + Closes #9037 + +Viktor Szakats (22 Jun 2022) +- Makefile.m32: stop forcing XP target with ipv6 enabled [ci skip] + + Since this [1] commit in 2011, `_WIN32_WINNT` was set fixed to Windows + XP when the `-ipv6` option is selected. Maybe this was added to support + pre-XP Windows versions (?). These days libcurl builds fine for both XP + and post-XP versions with IPv6 support enabled. The relevance of pre-XP + version is also low by now. Other build methods also do not impose such + limitation for a similar configuration. So, drop this hard-wired + `_WIN32_WINNT` limit from `Makefile.m32`, thus building for the default + Windows version set by the compiler. This is Vista for recent MinGW + versions. + + Old behaviour can be restored by setting this envvar: + export CURL_CFLAG_EXTRAS=-D_WIN32_WINNT=0x0501 + + [1] 98a61d8e2e8982786aaf3916cbbcac96838316e7 + + Closes #9035 + +Daniel Stenberg (21 Jun 2022) +- CONTRIBUTE: mention how we maintain REUSE compliance + + for copyright and license information of all files stored in git + + Closes #9032 + +- CURLOPT_ALTSVC.3: document the file format + + Closes #9033 + +Jay Satiro (21 Jun 2022) +- runtests: add "threadsafe" to detected features + + Follow-up to recent commits which added thread-safety support. + + Bug: https://github.com/curl/curl/pull/9012#discussion_r902018782 + Reported-by: Marc Hörsken + + Closes https://github.com/curl/curl/pull/9030 + +Daniel Stenberg (20 Jun 2022) +- easy: remove dead code + + Follow-up from 5912da253b64d + + Detected by Coverity (CID 1506519) + + Closes #9029 + +- [Glenn Strauss brought this change] + + transfer: upload performance; avoid tiny send + + Append to the upload buffer when only small amount remains in buffer + rather than performing a separate tiny send to empty buffer. + + Avoid degenerative upload behavior which might cause curl to send mostly + 1-byte DATA frames after exhausing the h2 send window size + + Related discussion: https://github.com/nghttp2/nghttp2/issues/1722 + + Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> + Closes #8965 + +- [Steve Holme brought this change] + + projects: fix third-party SSL library build paths for Visual Studio + + The paths used by the build batch files were inconsistent with those in + the Visual Studio project files. + + Closes #8991 + +- [Pierrick Charron brought this change] + + urlapi: make curl_url_set(url, CURLUPART_URL, NULL, 0) clear all parts + + As per the documentation : + + > Setting a part to a NULL pointer will effectively remove that + > part's contents from the CURLU handle. + + But currently clearing CURLUPART_URL does nothing and returns + CURLUE_OK. This change will clear all parts of the URL at once. + + Closes #9028 + +- [Philip H brought this change] + + CI: bump FreeBSD 13.0 to 13.1 + + Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> + Closes #8815 + +- RELEASE-NOTES: synced + + and updated release date in RELEASE-PROCEDURE.md + +- [divinity76 brought this change] + + CURLOPT_HTTPHEADER.3: improve comment in example + + Closes #9025 + +Marc Hoersken (16 Jun 2022) +- CI/azure: reduce flakiness by retrying install/prepare steps + + Closes #9010 + +- CI/cirrus: align Windows timeout with Azure CI at 120 minutes + + Closes #9009 + +Jay Satiro (16 Jun 2022) +- vtls: make curl_global_sslset thread-safe + + .. and update some docs to explain curl_global_* is now thread-safe. + + Follow-up to 23af112 which made curl_global_init/cleanup thread-safe. + + Closes https://github.com/curl/curl/pull/9016 + +- curl_easy_pause.3: remove explanation of progress function + + - Remove misleading text that says progress function "gets called at + least once per second, even if the connection is paused." + + The progress function behavior is more nuanced and the user is better + served reading the progress function doc rather than attempt to explain + it in the curl_easy_pause doc. + + The progress function can only be called at least once per second if an + appropriate multi transfer function is called (eg curl_multi_perform) in + that time. For a paused transfer there may not be such a call. Rather + than explain this in detail in the curl_easy_pause doc, rely on the user + reading the CURLOPT_PROGRESSFUNCTION doc. + + Ref: https://github.com/curl/curl/issues/8983 + + Closes https://github.com/curl/curl/pull/9015 + +Daniel Stenberg (15 Jun 2022) +- libssh: skip the fake-close when libssh does the right thing + + Starting in libssh 0.10.0 ssh_disconnect() will no longer close our + socket. Instead it will be kept alive as we want it, and it is our + responsibility to close it later. + + Ref: #8718 + Ref: https://gitlab.com/libssh/libssh-mirror/-/merge_requests/240 + Closes #9021 + +- configure: warn about rustls being experimental + + Right now a dozen test cases are disabled because they don't work with + rustls. + + Closes #9019 + +- runtests: skip starting the ssh server if user name is lacking + + Because the ssh server startup script *requires* a user name there's no + point in invoking it if no name was found. + + Reported-by: Ricardo M. Correia + Ref: #9007 + Closes #9013 + +- copyright.pl: parse and use .reuse/dep5 for skips + + Also scan skipped files to be able to find superfluous ignores, shown with -v. + + Closes #9006 + +- reuse/dep5: adjusted to parse better + + ... adjusted a few files to contain copyright and license info. + + Closes #9006 + +- buildconf.bat: update copyright year range + + Closes #9006 + +- README.md: use the common "Copyright" style formatting + + Closes #9006 + +- reuse: move license info from .mailmap.license to .reuse/dep5 + + Closes #9006 + +- README.md: add a REUSE badge + + Closes #9004 + +- .reuse/dep5: remove recursive docs ignore, only skip markdown files + + ... and some additional non-markdown individual files in docs/ + + Closes #9005 + +- docs/cmdline-opts: add copyright and license identifier to each file + + gen.pl now insists on C: and SPDX-License-Identifier: fields to be + present in all files. + + Closes #9002 + +- copyright: info for/ignore .github/ISSUE_TEMPLATE/bug_report.md + + Follow-up from 448f7ef9ab2afb7. The adding of the copyright text in that + file broke site functionality. + + Closes #9001 + +- bug_report.md: revert the REUSE template to see if it works again + +Viktor Szakats (13 Jun 2022) +- version: rename threadsafe-init to threadsafe + + Referring to Daniel's article [1], making the init function thread-safe + was the last bit to make libcurl thread-safe as a whole. So the name of + the feature may as well be the more concise 'threadsafe', also telling + the story that libcurl is now fully thread-safe, not just its init + function. Chances are high that libcurl wants to remain so in the + future, so there is little likelihood of ever needing any other distinct + `threadsafe-<name>` feature flags. + + For consistency we also shorten `CURL_VERSION_THREADSAFE_INIT` to + `CURL_VERSION_THREADSAFE`, update its description and reference libcurl's + thread safety documentation. + + [1]: https://daniel.haxx.se/blog/2022/06/08/making-libcurl-init-more-thread-safe/ + + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + Closes #8989 + +Daniel Stenberg (13 Jun 2022) +- test3026: disable on win32 + + ... as it's not likely to have working pthreads + + Closes #8996 + +- GHA: shorten the reuse CI job name + + "REUSE compliance / check" should be good enough + + Closes #9000 + +- misc: add missing SPDX-License-Identifier info + + For some reason the REUSE CI job did not find these. + + Closes #8999 + +- copyright: verify SPDX-License-Identifier presence as well + +- easy_lock: add SPDX license identifier + + Closes #8998 + +- mailmap: Max Mehl + +- [Max Mehl brought this change] + + git: ignore large commit making the curl REUSE compliant + +- [Max Mehl brought this change] + + copyright: make repository REUSE compliant + + Add licensing and copyright information for all files in this repository. This + either happens in the file itself as a comment header or in the file + `.reuse/dep5`. + + This commit also adds a Github workflow to check pull requests and adapts + copyright.pl to the changes. + + Closes #8869 + +- curl_url_set.3: clarify by default using known schemes only + + Closes #8994 + +- scripts/copyright.pl: ignore leading spaces + +Viktor Szakats (10 Jun 2022) +- ngtcp2: fix typo in preprocessor condition + + Ref: 927ede7edcb7b05b8e8bbf9ced6aed523ae594a7 + + Bug: https://github.com/curl/curl/pull/8981#discussion_r894312185 + Reported-by: Emil Engler + Closes #8987 + +Daniel Stenberg (10 Jun 2022) +- RELEASE-NOTES: synced + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: build without sendmsg + + Closes #8981 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: use handshake helper funcs to simplify TLS handshake integration + + Closes #8968 + +- test390: verify --parallel + + Closes #8985 + +- test1543: verify CURLINFO_EFFECTIVE_URL with CURLOPT_CURLU set + + Triggered by a bug report from Adam Light: + https://curl.se/mail/lib-2022-06/0013.html - which ended up being mostly + a misunderstanding of how CURLINFO_EFFECTIVE_URL works. + + Closes #8971 + +- url: URL encode the path when extracted, if spaces were set + +- urlapi: support CURLU_URLENCODE for curl_url_get() + +- server/sws: support spaces in the HTTP request path + +- tests/getpart: fix getpartattr to work with "data" and "data2" + +- select: return error from "lethal" poll/select errors + + Adds two new error codes: CURLE_UNRECOVERABLE_POLL and + CURLM_UNRECOVERABLE_POLL one each for the easy and the multi interfaces. + + Reported-by: Harry Sintonen + Fixes #8921 + Closes #8961 + +- test3026: add missing control file + + Follow-up from 2ed101256414ea5 + + Makes the test run, makes 'make dist' work + + This single test takes 24-25 seconds on my machine (with valgrind). For + this reason I tag it with a "slow" keyword. + + Closes #8976 + +- runtests: fix skipping tests not done event-based + + ... and call timestampskippedevents() to avoid the flood of + uninitialized variable warnings. + + Closes #8977 + +- transfer: maintain --path-as-is after redirects + + Reported-by: Marcus T + Fixes #8974 + Closes #8975 + +- test391: verify --path-as-is with redirect + +Jay Satiro (8 Jun 2022) +- curl_global_init.3: Separate the Windows loader lock warning + + This is a slight correction of the parent commit which implied the + loader lock warning only applied if not thread-safe. In fact the loader + lock warning applies either way. + + Ref: https://github.com/curl/curl/pull/8972#discussion_r891987030 + +Daniel Stenberg (8 Jun 2022) +- curl_global_init.3: this is now (usually) thread-safe + + Follow-up to 23af112f5556 + + Closes #8972 + +Jay Satiro (8 Jun 2022) +- [Haxatron brought this change] + + libcurl-security.3: Document CRLF header injection + + - Document that user input to header options is not sanitized, which + could result in CRLF used to modify the request in a way other than + what was intended. + + Ref: https://hackerone.com/reports/1589877 + Ref: https://medium.com/@tomnomnom/crlf-injection-into-phps-curl-options-e2e0d7cfe545 + + Closes https://github.com/curl/curl/pull/8964 + +- CURLOPT_RANGE.3: remove ranged upload advice + + The e-mail link in the advice contains instructions that are prone to + error. We need an example that works and can demonstrate how to properly + perform a ranged upload, and then we can refer to that example instead. + + Bug: https://github.com/curl/curl/issues/8969 + Reported-by: Simon Berger + + Closes https://github.com/curl/curl/pull/8970 + +Daniel Stenberg (7 Jun 2022) +- [Thomas Guillem brought this change] + + curl_version_info: add CURL_VERSION_THREADSAFE_INIT + + This flag can be used to make sure that curl_global_init() is + thread-safe. + + This can be useful for libraries that can't control what other + dependencies are doing with Curl. + + Closes #8680 + +- [Thomas Guillem brought this change] + + lib: make curl_global_init() threadsafe when possible + + Use a posix pthread or a Windows SRWLOCK to lock curl_global_init*() and + curl_global_cleanup(). + + Closes #8680 + +- RELEASE-NOTES: synced + +- [Fabian Keil brought this change] + + test414: add the '--resolve' keyword + + ... so the test can be automatically skipped when + using an external proxy like Privoxy. + + Closes #8959 + +- [Fabian Keil brought this change] + + test{440,441,493,977}: add "HTTP proxy" keywords + + ... so the tests can be automatically skipped when + using an external proxy like Privoxy. + + Closes #8959 + +- [Fabian Keil brought this change] + + runtests.pl: add the --repeat parameter to the --help output + + Closes #8959 + +- [Fabian Keil brought this change] + + test 2081: add a valid reply for the second request + + ... so the test works when using a HTTP proxy like + Privoxy that sends an error message if the server + doesn't send data. + + Closes #8959 + +- [Fabian Keil brought this change] + + test 675: add missing CR so the test passes when run through Privoxy + + Closes #8959 + +- ftp: when failing to do a secure GSSAPI login, fail hard + + ... instead of switching to cleartext. For the sake of security. + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1590102 + Closes #8963 + +- http2: reject overly many push-promise headers + + Getting more than a thousand of them is rather a sign of some kind of + attack. + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1589847 + Closes #8962 + +- [Fabian Keil brought this change] + + misc: spelling improvements + + Closes #8956 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix assertion failure on EMSGSIZE + + Closes #8958 + +- easy/transfer: fix cookie-disabled build + + Follow-up from 45de940cebf6a + Reported-by: Marcel Raad + Fixes #8953 + Closes #8954 + +- examples/crawler.c: use the curl license + + With permission from Jeroen Ooms + + URL: https://github.com/curl/curl/pull/8869#issuecomment-1144742731 + Closes #8950 + +- speed-limit/time.d: mention these affect transfers in either direction + + Reported-by: Ladar Levison + Fixes #8948 + Closes #8951 + +- scripts/copyright.pl: fix the exclusion to not ignore man pages + + Ref: #8869 + Closes #8952 + +- examples: remove fopen.c and rtsp.c + + To simplify the license situation, as they were the only files in the + source tree using these specific BSD-3 clause licenses. + + For an fopen style API, we recommend instead going + https://github.com/curl/fcurl + + Ref: #8869 + Closes #8949 + +- [Wolf Vollprecht brought this change] + + netrc: check %USERPROFILE% as well on Windows + + Closes #8855 + +- CURLOPT_SSH_HOSTKEYDATA/FUNCTION.3: minor polish + +- [michael musset brought this change] + + libssh2: add CURLOPT_SSH_HOSTKEYFUNCTION + + The callback set by CURLOPT_SSH_HOSTKEYFUNCTION is called to check + wether or not the connection should continue. + + The host key is passed in argument with a custom handle for the + application. + + It overrides CURLOPT_SSH_KNOWNHOSTS + + Closes #7959 + +- docs/CONTRIBUTE.md: document the 'needs-votes' concept + + A pull request sent to the project might get labeled `needs-votes` by a + project maintainer. This label means that in addition to meeting all + other checks and qualifications this pull request must also receive + proven support/thumbs-ups from more community members to be considered + for merging. + + Closes #8910 + +- [Evgeny Grin brought this change] + + digest: tolerate missing "realm" + + Server headers may not define "realm", avoid NULL pointer dereference + in such cases. + + Closes #8912 + +- [Evgeny Grin brought this change] + + digest: added detection of more syntax error in server headers + + Invalid headers should not be processed otherwise they may create + a security risk. + + Closes #8912 + +- [Evgeny Grin brought this change] + + digest: unquote realm and nonce before processing + + RFC 7616 (and 2617) requires values to be "unquoted" before used for + digest calculations. The only place where unquoting can be done + correctly is header parsing function (realm="DOMAIN\\host" and + realm=DOMAN\\host are different realms). + + This commit adds unquoting (de-escaping) of all values during header + parsing and quoting of the values during header forming. This approach + should be most straightforward and easy to read/maintain as all values + are processed in the same way as required by RFC. + + Closes #8912 + +- headers: handle unfold of space-cleansed headers + + Detected by OSS-fuzz + + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=47767 + + Updated test 1274 + + Closes #8947 + +- lib: make more protocol specific struct fields #ifdefed + + ... so that they don't take up space if the protocols are disabled in + the build. + + Closes #8944 + +- DISABLED: disable 1021 for hyper again + + due to flakiness in the CI builds + +- urldata: store tcp_keepidle and tcp_keepintvl as ints + + They can't be set larger than INT_MAX in the setsocket API calls. + + Also document the max values in their respective man pages. + + Closes #8940 + +- urldata: reduce size of a few struct fields + + When the values are never larger than 32 bit, ints are better than longs. + + Closes #8940 + +- urldata: remove three unused booleans from struct UserDefined + + - is_fwrite_set + - free_referer + - strip_path_slash + + Closes #8940 + +- remote-name.d: mention --output-dir + + plus add two see-alsos + + Closes #8945 + +Jay Satiro (1 Jun 2022) +- configure: skip libidn2 detection when winidn is used + + Prior to this change --with-winidn could be overridden by libidn2 + detection. + + Closes https://github.com/curl/curl/pull/8934 + +Daniel Stenberg (31 May 2022) +- CURLOPT_FILETIME.3: fix the protocols this works with + +- test681: verify --no-remote-name + + Follow-up to 83ee5c428d960 (from #8931) + + Closes #8942 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: enable Linux GSO + + Enable Linux GSO in ngtcp2 QUIC. In order to recover from the + EAGAIN/EWOULDBLOCK by sendmsg with multiple packets in one GSO write, + packet buffer is now held by struct quicsocket. GSO write might fail in + runtime depending on NIC. Disable GSO if sendmsg returns EIO. + + Closes #8909 + +- CURLOPT_PORT.3: We discourage using this option + + Closes #8941 + +- RELEASE-NOTES: synced + +- headers_push: error out if a folded header has no previous header + + As that would indicate an illegal header. The fuzzer reached the assert + in unfold_value() proving that this case can happen. + + Follow-up to c9b60f005358a364 + + Closes #8939 + +- [Boris Verkhovskiy brought this change] + + curl: re-enable --no-remote-name + + Closes #8931 + +- test680: require 'http' since it uses such a URL + + Follow-up to d1b376c03524 + +- CURLOPT_NETRC.3: document the .netrc file format + +- test680: verify rejection of malformatted .netrc quoted password + +- test679: verify netrc quoted string + +- netrc: support quoted strings + + The .netrc parser now accepts strings within double-quotes in order to + deal with for example passwords containing white space - which + previously was not possible. + + A password that starts with a double-quote also ends with one, and + double-quotes themselves are escaped with backslashes, like \". It also + supports \n, \r and \t for newline, carriage return and tabs + respectively. + + If the password does not start with a double quote, it will end at first + white space and no escaping is performed. + + WARNING: this change is not entirely backwards compatible. If anyone + previously used a double-quote as the first letter of their password, + the parser will now get it differently compared to before. This is + highly unfortunate but hard to avoid. + + Reported-by: ImpatientHippo on GitHub + Fixes #8908 + Closes #8937 + +- curl_getdate.3: document that some illegal dates pass through + + Closes #8938 + +- CI: remove configure --enable-headers-api flags + +- headers api: remove EXPERIMENTAL tag + + Closes #8900 + +Daniel Gustafsson (30 May 2022) +- cookies: fix documentation comment + + Commit 4073cd83b2 added the noexpire parameter to Curl_cookie_add but + missed updating the documentation comment at the head of the file. + +Daniel Stenberg (30 May 2022) +- [Marc Hoersken brought this change] + + tests/data/test1940: use binary mode for expected stdout + + The generated stdout data is written in binary mode with [LF] + line endings, therefore we also need to do a binary comparison. + + Assisted-by: Jay Satiro + Assisted-by: Daniel Stenberg + + Follow up to c9b60f005358a364cbcddbebd8d12593acffdd84 + Fixes #8920 + Closes #8936 + +- CURLINFO_CAINFO/PATH.3: clarify the multiple TLS situation + + Spell out the multi-TLS situation. + + Reported-by: Dan Fandrich + Fixes #8926 + Closes #8932 + +Jay Satiro (28 May 2022) +- [JustAnotherArchivist brought this change] + + tool_getparam: fix --parallel-max maximum value constraint + + - Clamp --parallel-max to MAX_PARALLEL (300) instead of resetting to + default value. + + Previously, --parallel-max 300 would use 300 concurrent transfers, but + --parallel-max 301 would unexpectedly use only 50. This change clamps + higher values to the maximum (ie --parallel-max 301 would use 300). + + Closes https://github.com/curl/curl/pull/8930 + +Daniel Stenberg (27 May 2022) +- curl.1: add a few see also --tls-max + + Closes #8929 + +Viktor Szakats (26 May 2022) +- cmake: do not add libcurl.rc to the static libcurl library + + Fixes: https://github.com/curl/curl/pull/8918#issuecomment-1138263855 + + Reviewed-By: Karlson2k@users.noreply.github.com + Closes #8923 + +- cmake: support adding a suffix to the OS value + + CMake automatically uses the `CMAKE_SYSTEM_NAME` value to fill the OS + string appearing in the --version output after the curl version number, + for example: + + 'curl 7.83.1 (Windows)' + + This patchs adds the ability to pass a suffix that is appended to this + value. It's useful to add CPU info or other platform details, + for example: + + 'curl 7.83.1 (Windows-x64)' + + Closes #8919 + +- cmake: enable curl.rc for all Windows targets + + Before this patch, it was only enabled for MSVC. This syncs this + configuration with libcurl.rc, which was already included with + every Windows compiler. + + Closes #8918 + +- cmake: fix detecting libidn2 + + Without this patch, libidn2 detection doesn't even seem to be + attempted. With this patch, cmake can be configured to pick it + up and enable it. Necessary configuration remains manual and + differs from most other dependencies. + + If you are aware of a better fix, we're glad hearing about it + in a new Issue. + + Closes #8917 + +- version: allow stricmp() for sorting the feature list + + In CMakeLists.txt there is an attempt to detect `stricmp()`, and in + certain cases, this attempt is the only successful one to detect a + case-insensitive comparison function. `HAVE_STRICMP` is defined as + a result, but this macro wasn't used anywhere in the source. This + patch makes use of it as an alternative when alpha-sorting the + `--version` feature list. + + Reviewed-by: Daniel Stenberg + Closes #8916 + +Daniel Stenberg (25 May 2022) +- DISABLED: add six tests that fail with hyper + + 1117 1274 1940 1941 1942 1943 + +- c-hyper: mark status line as status for Curl_client_write() + + To make sure the headers API can filter it out as not a regular header. + + Reported-by: Gisle Vanem + Fixes #8894 + Closes #8914 + +Marc Hoersken (25 May 2022) +- tests/data/test1501: kill ftp server after slow LIST response + + This test is contributing to flakiness on the Windows CI runs. + Killing the ftp server after the test run like other slowness + tests already do may help resolve or reduce the flakiness. + + Closes #8907 + +Daniel Stenberg (25 May 2022) +- headers: fix the unfold realloc to use proper new size + + Previously it didn't take the old name length into acount + + Follow-up to: c9b60f005358a364 + Closes #8913 + +Marc Hoersken (25 May 2022) +- GHA: align all install, configure and build steps again + + First step towards more unified build steps on GitHub Actions. + + Closes #8873 + +- CI/azure: remove obsolete strategy for single builds + + This shortens these CI job names on GitHub even more. + Follow up to #8906 which also increased their timeout. + + Closes #8911 + +- CI/azure: shorten names of Windows CI jobs + + Suggested-by: Daniel Stenberg + Closes #8906 + +Daniel Stenberg (24 May 2022) +- http: restore header folding behavior + + Folded header lines will now get passed through like before. The headers + API is adapted and will provide the content unfolded. + + Added test 1274 and extended test 1940 to verify. + + Reported-by: Petr Pisar + Fixes #8844 + Closes #8899 + +Viktor Szakats (24 May 2022) +- Makefile.m32: delete obsolete options, improve -On [ci skip] + + - `-D_AMD64_` has not been necessary for mingw-w64 builds for a long time now. + - `-fno-strict-aliasing` is mentioned for Intel C compiler in autotools, and + I used this with VxWorks in another project, but otherwise this isn't + necessary anymore as a default. If a target still needs it, it can be + added with `CURL_CFLAG_EXTRAS=-fno-strict-aliasing` + - bump up default optimization level to `-O3` (from `-O2`), and also rearrange + option order so the default can now be overridden via + `CURL_CFLAG_EXTRAS`. + - delete `-g` (generate debug info) from `CFLAGS` and `-s` from `LDFLAGS` + (strip debug info). They were working against each other. Now, if someone + needs debug info, it can be enabled via `CURL_CFLAG_EXTRAS=-g` + + Closes #8904 + +Daniel Gustafsson (24 May 2022) +- ntlm: fix one more hostname test fallout + + This fixup was missed in commit 5a41abef6dca19. + + Closes: #8901 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +- doh: remove UNITTEST macro definition + + The UNITTEST macro is defined by curl_setup.h so there is no use in + carry a local copy of the logic. + + Closes: #8902 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +Daniel Stenberg (24 May 2022) +- cookie: fix false positive "potentially uninitialized local variable" + + Reviewed-by: Daniel Gustafsson + Closes #8903 + +- curl: add --rate to set max request rate per time unit + + --rate "12/m" - for 12 per minute or + --rate "5/h" - for 5 per hour + + Removed from TODO + + Closes #8671 + +- [Jay Satiro brought this change] + + max-time.d: clarify max-time sets max transfer time + + Prior to this change the doc said --max-time set the maximum time of the + 'whole operation' which is not accurate. The option maps to + CURLOPT_TIMEOUT_MS which sets maximum transfer time. + + For example, the maximum time on a transfer is reset if the transfer is + retried (--retry). + + Reported-by: Nuru@users.noreply.github.com + + Fixes https://github.com/curl/curl/issues/8877 + Closes #8879 + +- GHA/hyper: enable debug in the build + +- hyper: use 'alt-used' + + Makes test 412+413 work + + Closes #8898 + +- RELEASE-NOTES: synced + +- CURLINFO_CAPATH/CAINFO: get the default CA paths from libcurl + + Closes #8888 + +- links: update dead links + + The wiki pages are gone, remove and link to more long-living docs. + + Closes #8897 + +- ntlm: (void) typecast msnprintf() where we ignore return code + + Follow-up to 5a41abef6, to please Coverity + +Daniel Gustafsson (22 May 2022) +- ntlm: copy NTLM_HOSTNAME to host buffer + + Commit 709ae2454f43 added a fake hostname to avoid leaking the local + hostname, but omitted copying it to the host buffer. Fix by copying + and adjust the test fallout. + + Closes: #8895 + Fixes: #8893 + Reported-by: Patrick Monnerat <patrick@monnerat.net> + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +- configure: use the SED value to invoke sed + + Rather than assuming sed in PATH, use the resolved $SED variable + like in all other invocations of sed in configure. + + Closes: #8891 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + Reviewed-by: Marcel Raad <Marcel.Raad@teamviewer.com> + +Daniel Stenberg (20 May 2022) +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Allow curl to send larger UDP datagrams + + Allow curl to send larger UDP datagram if Path MTU Discovery finds the + availability of larger path MTU. To make it work and not to send + fragmented packet, we need to set DF bit. That makes send(2) fail with + EMSGSIZE if UDP datagram is too large. In that case, just let it be + lost. This patch enables DF bit for Linux only. + + Closes #8883 + +- libcurl-security.3: add "Secrets in memory" + + Closes #8881 + +- tests: update NTLM tests to use new host name + + Also drop the debug requirement, remove the setenv sections, remove + prechecks and add NTLM to the top keywords. + + Closes #8889 + +- ntlm: provide a fixed fake host name + + The NTLM protocol includes providing the local host name, but apparently + other implementations already provide a fixed fake name instead to avoid + leaking the real local name. + + The exact name used is 'WORKSTATION', because Firefox uses that. + + The change is written to allow someone to "back-pedal" fairly easy in + case of need. + + Reported-by: Carlo Alberto + Fixes #8859 + Closes #8889 + +Daniel Gustafsson (20 May 2022) +- KNOWN_BUGS: fix typo in problem description + + s/TSL/TLS/ + +- FEATURES: remove yassl as TLS library for NTLM + + yassl was added in commit 9d904ee41b880b but is no longer available + and is thus not a library to use for NTLM. This aligns the FEATURES + doc with the FAQ. + + Closes: #8886 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +- FEATURES: reorder footnotes + + The empty left-behind footnote confused the website rendering into + creating a nested emoty list, making the resulting page look quite + odd. Remove and re-order the remaining ones to avoid a gap in the + sequence. + + Closes: #8886 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +- FAQ: remove opinionated sentence on NTLM + + curl is a tool that support many different things, and it doesn't + really seem like our job to tell other what to use (as they might + not have much say in the matter even). Also tidy up wording. + + Closes: #8886 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +Viktor Szakats (20 May 2022) +- log2changes: do not indent empty lines [ci skip] + + This will omit two spaces of indentation from lines with no content, + thus avoiding 'spaces @ EOL'. + + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + Closes #8887 + +Daniel Stenberg (19 May 2022) +- wolfssl: correct the failf() message when a handle can't be made + + Closes #8885 + +Viktor Szakats (19 May 2022) +- Makefile.m32: delete two obsolete OpenSSL options [ci skip] + + - -DOPENSSL_NO_KRB5: No longer used by OpenSSL 1.1.x, 3.x, or + LibreSSL 3.5.x, yet it collides with the latter, which defines + it unconditionally, resulting in this warning: + ../../libressl/include/openssl/opensslfeatures.h:14:9: warning: 'OPENSSL_NO_KRB5' macro redefined [-Wmacro-redefined] + It was originally added to curl in 2004. + + - -DHAVE_OPENSSL_PKCS12_H: No longer used by OpenSSL 1.1.x, 3.x, or + LibreSSL back to at least 2.5.5. Originally added in the same + commit as the above, in 2004. + + Closes #8884 + +Daniel Stenberg (19 May 2022) +- RELEASE-NOTES: synced + + bump to 7.84.0 + +- [Christian Weisgerber via curl-library brought this change] + + Makefile.am: fix portability issues + + Commit a04f0b961333e1a19848d073d8c7db9c20b2a371 made me notice that + there is a portability issue in curl's top-level Makefile.am. + + $< can only be used in rules that deal with .SUFFIXES. Its use + for general prerequisites is a GNU make extension. + + $< could be replaced by $?, but I think in an autotools context, + something like this is better: + + Bug: https://curl.se/mail/lib-2022-05/0024.html + Closes #8861 + +- [Balakrishnan Balasubramanian brought this change] + + socks: support unix sockets for socks proxy + + Usage: + curl -x "socks5h://localhost/run/tor/socks" "https://example.com" + + Updated runtests.pl to run a socksd server listening on unix socket + + Added tests test1467 test1468 + + Added documentation for proxy command line option and socks proxy + options + + Closes #8668 + +- [Vincent Torri brought this change] + + cmake: add libpsl support + + Fixes #8865 + Closes #8867 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: extend QUIC transport parameters buffer + + Extend QUIC transport parameters buffer because 64 bytes are too + short for the ever increasing parameters. + + Closes #8872 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: handle error from ngtcp2_conn_submit_crypto_data + + Closes #8871 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: send appropriate connection close error code + + Closes #8870 + +- test1561: adjusted for the cookie fix + +- test414: verify secure cookie domain overlay + +- [Harry Sintonen brought this change] + + cookie: address secure domain overlay + + Bug: https://hackerone.com/reports/1560324 + Co-authored-by: Daniel Stenberg + Closes #8840 + +- [Frank Gevaerts brought this change] + + strcase: some optimisations + + Lookup tables for toupper() and tolower() make Curl_strcasecompare() + about 1.5 times faster. Reorganising Curl_strcasecompare() to fully exit + early then also allows simplifying the check at the end, for another + 15%. In total, the changes make Curl_strcasecompare() around 1.6 to 1.7 + times faster. + + Note that these optimisation assume ASCII. The original + Curl_raw_toupper() and raw_tolower() look like they already made that + assumption. + + Closes #8875 + +- BUG-BOUNTY.md: mention the audit exception + + Dedicated - paid for - security audits that are performed in + collaboration with curl developers are not eligible for bounties. + + (plus I changed the sub-titles to use ## instead of # in the markdown) + + Closes #8880 + +- lib/vssh/wolfssh.h: removed + + Unused header file + + Reported-by: Illarion Taev + Fixes #8863 + Closes #8866 + +- [Elms brought this change] + + wolfSSL: explicitly use compatibility layer + + This change removes adding an include `$prefix/wolfssl` or similar to + allow for openssl include aliasing. Include paths of `wolfssl/openssl/` + are used to explicitly use wolfSSL includes. This fixes cmake builds as + well as avoiding potentially using openSSL headers since include path + order is not guaranteed. + + Closes #8864 + +- curl: deprecate --random-file and --egd-file + + As libcurl no longer has any functionality for them, the tool now does + nothing with them. + + Closes #8670 + +- opts: deprecate RANDOM_FILE and EGDSOCKET + + These two options were only ever used for the OpenSSL backend for + versions before 1.1.0. They were never used for other backends and they + are not used with recent OpenSSL versions. They were never used much by + applications. + + The defines RANDOM_FILE and EGD_SOCKET can still be set at build-time + for ancient EOL OpenSSL versions. + + Closes #8670 + +- [Harry Sintonen brought this change] + + bindlocal: don't use a random port if port number would wrap + + Earlier if CURLOPT_LOCALPORT + CURLOPT_LOCALPORTRANGE would go past port + 65535 the code would fall back to random port rather than giving up. + + Closes #8862 + +Daniel Gustafsson (16 May 2022) +- transfer: Fix potential NULL pointer dereference + + Commit 0ef54abf5208 accidentally used the conn variable before the + assertion for it being NULL. Fix by moving the assignment which use + conn to after the assertion. + + Closes: #8857 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +- docs: clarify data replacement policy for MIME API + + The API documentation for the MIME functions specify that the parts + can be set twice, with the last call winning. While true, the user + can set the parts n times for n > 2, reword to specify multiple API + calls instead. + + Closes: #8860 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +Daniel Stenberg (16 May 2022) +- [vvb2060 on github brought this change] + + ngtcp2: support boringssl crypto backend + + Closes #8789 + +- [Tatsuhiro Tsujikawa brought this change] + + quic: add Curl_quic_idle + + Add Curl_quic_idle which is called when no HTTP level read or write is + performed. It is a good place to handle timer expiry for QUIC transport + (.e.g, retransmission). + + Closes #8698 + +- [Gregor Jasny brought this change] + + mprintf: ignore clang non-literal format string + + Closes #8740 + +- [Nick Zitzmann brought this change] + + sectransp: check for a function defined when __BLOCKS__ is undefined + + SecTrustEvaluateAsync() is defined in the macOS 10.7 SDK, but it + requires Grand Central Dispatch to be supported by the compiler, and + some third-party macOS compilers do not support Grand Central Dispatch. + SecTrustCopyPublicKey() is not present in macOS 10.6, so this shouldn't + adversely affect anything. + + Fixes #8846 + Reported-by: Egor Pugin + Closes #8854 + +Daniel Gustafsson (16 May 2022) +- test412/413: Use version macro for User-Agent + + Commit 46d45ea3a incorrectly hardcoded the User-Agent in the test + output file which breaks when curlver is updated. Shift to using + the %VERSION macro instead. + + Closes: #8856 + +- macos9: remove partial support + + The support for compiling on Mac OS 9 hasn't been modified since 2001 + and has no active maintainer or packager, so it's time to remove it as + it's incredibly unlikely to work. If a maintainer re-emerges it can be + resurrected from Git history. + + Closes: #8836 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +Daniel Stenberg (16 May 2022) +- test1635: verify --fail-with-body with --retry + + Almost a dupe of 1634 + + Closes #8847 + +- tool_operate: make sure --fail-with-body works with --retry + + ... in the same way --fail already does. + + Reported-by: Jakub Bochenski + Fixes #8845 + Closes #8847 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Correct use of ngtcp2 and nghttp3 signed integer types + + Closes #8851 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Fix alert_read_func return value + + Closes #8852 + +- [Harry Sintonen brought this change] + + Curl_parsenetrc: don't access local pwbuf outside of scope + + Accessing local variables outside of the scope is forbidden and + depending on the compiler can result in the value being + overwritten. Fixed by moving the pwbuf to be in scope. + + Closes #8850 + +- RELEASE-NOTES: synced + + and bump curlver to 7.83.2 for now (but likely to become 7.84.0 soon) + +- [Frazer Smith brought this change] + + ci: update github actions + + - bump actions/checkout from 2 to 3 + - bump actions/upload-artifact from 1 to 3 + - bump github/codeql-actions from 1 to 2 + - use version tag for actions/checkout + + Closes #8843 + +- test1919: verify CURLOPT_XOAUTH2_BEARER leak fix + +- url: free old conn better on reuse + + Make use of conn_free() better and avoid duplicate code. + + Reported-by: Andrea Pappacoda + Fixes #8841 + Closes #8842 + +Jay Satiro (14 May 2022) +- FAQ: Clarify Windows double quote usage + + - Windows command prompt doesn't use literal quoting via single quotes. + + - Windows command prompt inner double quotes are escaped with a + backslash. + + - Windows powershell does use single quotes but curl is not a powershell + script so the arguments may not be passed on correctly. + + - Windows powershell inner double quotes seems can be passed to curl if + the outer quotes are double quotes and an escape of backslash-backtick + is used. + + Command prompt example: + + ~~~ + getargs -v -d "\"a\"" + + argv[0]: getargs + argv[1]: -v + argv[2]: -d + argv[3]: "a" + ~~~ + + Ref: https://github.com/curl/curl/issues/8818 + Ref: https://gist.github.com/jay/19aba48653bd591cf4b90eb9249a302c + + Reported-by: KotlinIsland@users.noreply.github.com + + Closes https://github.com/curl/curl/pull/8823 + +Daniel Stenberg (12 May 2022) +- github/workflows/nss: apt update first + + Fix "libnss3-dev_3.49.1-1ubuntu1.6_amd64.deb 404 Not Found" + + Closes #8837 + +- page-footer: mention exit code zero too + + Success (zero) is also an "exit code" worth mentioning. + + Closes #8833 + +Daniel Gustafsson (12 May 2022) +- gssapi: initialize gss_buffer_desc strings + + Explicitly initialize gss_buffer_desc strings such that a call to + freeing resources will succeed even if no data has been allocated + to it. + + Reported-by: Jay Satiro <raysatiro@yahoo.com> + +- gssapi: improve handling of errors from gss_display_status + + In case gss_display_status() returns an error, avoid trying to add + it to the buffer as the message may well be a NULL pointer. + + Originally this fix comes from a discussion in issue #8816. + + Closes: #8832 + Reviewed-by: Jay Satiro <raysatiro@yahoo.com> + +Jay Satiro (12 May 2022) +- [steini2000 brought this change] + + http2: always debug print stream id in decimal with %u + + Prior to this change the stream id shown could be hex or decimal which + was inconsistent and confusing. + + Closes https://github.com/curl/curl/pull/8808 + +Kamil Dudka (11 May 2022) +- url: remove redundant #ifdefs in allocate_conn() + + No change in behavior intended by this commit. + +Daniel Stenberg (11 May 2022) +- [Fabian Keil brought this change] + + tests 266, 116 and 1540: add a small write delay + + This makes it more likely that the trailer is received + seperately from the last-chunk. + + curl doesn't seem to care about this but it makes the tests + more useful when testing external proxies like Privoxy. + +- [Fabian Keil brought this change] + + tests 1117,1238,1523: adjust writedelay servercmds + + ... so the delays are the same now that the unit + is in milliseconds. + +- [Fabian Keil brought this change] + + tests/server/sws.c: change the HTTP writedelay unit to milliseconds + + This allows to use write delays for large responses without + resulting in the test taking an unreasonable amount of time. + + In many cases delaying writes by a whole second or more isn't + necessary for the desired effect. + + Closes #8827 + +Daniel Gustafsson (11 May 2022) +- aws-sigv4: fix potentional NULL pointer arithmetic + + We need to check if the strchr() call returns NULL (due to missing + char) before we use the returned value in arithmetic. There is no + live bug here, but fixing it before it can become for hygiene. + + Closes: #8814 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + +Daniel Stenberg (11 May 2022) +- quiche: support ca-fallback + + Follow-up to b01f3e679f4c1ea3 which added this for ngtcp2/openssl + + Removed from KNOWN_BUGS + + Fixes #8696 + Closes #8830 + +Daniel Gustafsson (11 May 2022) +- x509asn1: mark msnprintf return as unchecked + + We have lots of unchecked msnprintf calls, and this particular msnprintf + call isn't more interesting than the others, but this one yields a Coverity + warning so let's implicitly silence it. Going over the other invocations + is probably a worthwhile project, but for now let's keep the static + analyzers happy. + + Closes: #8831 + Reviewed-by: Daniel Stenberg <daniel@haxx.se> + Version 7.83.1 (11 May 2022) Daniel Stenberg (11 May 2022) - RELEASE-NOTES: synced - + curl 7.83.1 release - THANKS: added contributors from 7.83.1 - zuul: fix the ngtcp2-gnutls build - + Add packages and tweak the configure options. - + Use the GnuTLS 3.7.4 branch (not main). - + Closes #8829 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: add ca-fallback support for OpenSSL backend - + Closes #8828 - url: check SSH config match on connection reuse - + CVE-2022-27782 - + Reported-by: Harry Sintonen Bug: https://curl.se/docs/CVE-2022-27782.html Closes #8825 - tls: check more TLS details for connection reuse - + CVE-2022-27782 - + Reported-by: Harry Sintonen Bug: https://curl.se/docs/CVE-2022-27782.html Closes #8825 - cookies: make bad_domain() not consider a trailing dot fine - + The check for a dot in the domain must not consider a single trailing dot to be fine, as then TLD + trailing dot is fine and curl will accept setting cookies for it. - + CVE-2022-27779 - + Reported-by: Axel Chong Bug: https://curl.se/docs/CVE-2022-27779.html Closes #8820 - test977: reproduce ability to set cookie on TLD - + When PSL is not enabled - scripts/contributors.sh: correct the copyright range @@ -68,22 +1790,22 @@ Daniel Stenberg (11 May 2022) - test379: verify --remove-on-error with --no-clobber - post_per_transfer: remove the updated file name - + When --remove-on-error is used with --no-clobber, it might have an updated file name to remove. - + Bug: https://curl.se/docs/CVE-2022-27778.html - + CVE-2022-27778 - + Reported-by: Harry Sintonen - + Closes #8824 - hsts: ignore trailing dots when comparing hosts names - + CVE-2022-30115 - + Reported-by: Axel Chong Bug: https://curl.se/docs/CVE-2022-30115.html Closes #8821 @@ -93,17 +1815,17 @@ Daniel Stenberg (11 May 2022) - libtest/lib1560: verify the host name percent decode fix - urlapi: reject percent-decoding host name into separator bytes - + CVE-2022-27780 - + Reported-by: Axel Chong Bug: https://curl.se/docs/CVE-2022-27780.html Closes #8826 - nss: return error if seemingly stuck in a cert loop - + CVE-2022-27781 - + Reported-by: Florian Kohnhäuser Bug: https://curl.se/docs/CVE-2022-27781.html Closes #8822 @@ -111,70 +1833,70 @@ Daniel Stenberg (11 May 2022) - test412/413: verify alt-svc with trailing dots - altsvc: fix host name matching for trailing dots - + Closes #8819 - [Garrett Squire brought this change] hyper: fix test 357 - + This change fixes the hyper API such that PUT requests that receive a 417 response can retry without the Expect header. - + Closes #8811 - [Harry Sintonen brought this change] sectransp: bail out if SSLSetPeerDomainName fails - + Before the code would just warn about SSLSetPeerDomainName() errors. - + Closes #8798 - http_proxy/hyper: handle closed connections - + Enable test 1021 for hyper builds. - + Patched-by: Prithvi MK Fixes #8700 Closes #8806 - KNOWN_BUGS: timeout when reusing a http3 connection - + Closes #8764 - KNOWN_BUGS: configure --with-ca-fallback is not supported by h3 - + Closes #8696 - [Ryan Schmidt brought this change] Makefile: fix "make ca-firefox" - + Closes #8804 Daniel Gustafsson (5 May 2022) - tests: fix markdown formatting in README - + The asterisk in the abbreviation *NIX (for UNIX/Linux) needs to be escaped to not mean start of italic formatting. This is consistent with docs/RELEASE-PROCEDURE.md. - + Closes: #8802 Reviewed-by: Daniel Stenberg <daniel@haxx.se> Daniel Stenberg (5 May 2022) - TODO: expand on "Expose tried IP addresses that failed" - + Ref: #8794 Daniel Gustafsson (5 May 2022) - [Fabian Keil brought this change] tests/server: declare variable 'reqlogfile' static - + Silences the warning: - + CC socksd-socksd.o socksd.c:143:13: warning: no previous extern declaration for non-static variable 'reqlogfile' [-Wmissing-variable-declarations] @@ -185,17 +1907,17 @@ Daniel Gustafsson (5 May 2022) const char *reqlogfile = DEFAULT_REQFILE; ^ 1 warning generated. - + ... when compiling with clang 13. - + Closes: #8799 Reviewed-by: Daniel Gustafsson <daniel@yesql.se> - HTTP-COOKIES: add missing CURLOPT_COOKIESESSION - + Commit 980a47b42 added support for ignoring session cookies, but it was never added to the documentation. - + Closes: #8795 Reviewed-by: Daniel Stenberg <daniel@haxx.se> @@ -205,12 +1927,12 @@ Daniel Stenberg (5 May 2022) - [Philip H brought this change] .mailmap: update - + Closes #8800 Jay Satiro (5 May 2022) - mbedtls: fix some error messages - + Prior to this change some of the error messages misidentified the function that failed. @@ -220,74 +1942,74 @@ Daniel Stenberg (5 May 2022) - [Sergey Markelov brought this change] x509asn1: make do_pubkey handle EC public keys - + Closes #8757 - [Harry Sintonen brought this change] mbedtls: bail out if rng init fails - + There was a failf() call but no actual error return. - + Closes #8796 - [Sergey Markelov brought this change] urlapi: address (harmless) UndefinedBehavior sanitizer warning - + `while(i--)` causes runtime error: unsigned integer overflow: 0 - 1 cannot be represented in type 'size_t' (aka 'unsigned long') - + Closes #8797 - [Fabian Keil brought this change] test{898,974,976}: add 'HTTP proxy' keywords - + ... so the tests can be automatically skipped when testing external HTTP proxies like Privoxy. - + Closes #8791 - [Harry Sintonen brought this change] gskit_connect_step1: fixed bogus setsockopt calls - + setsockopt takes a reference to value, not value. With the current code this just leads to -1 return value with errno EFAULT. - + Closes #8793 - CURLOPT_SSH_AUTH_TYPES.3: fix the default - + The default is all possible methods. - + Closes #8792 - CURLOPT_DOH_URL.3: mention the known bug - + It is mostly duplicating info from KNOWN_BUGS but make it easier to find for users of this option. - + Closes #8790 - CURLOPT_HSTS*FUNCTION.3: document the involved structs as well - + Reviewed-By: Daniel Gustafsson Closes #8788 - docs/SECURITY-PROCESS.md: "Visible command line arguments" - SECURITY-PROCESS: mention "URL inconsistencies" - + ... as common problems that are *not* vulns. Daniel Gustafsson (2 May 2022) - contributors: strip off final comma - + The final row of contributors should not end with a comma as it's the end of the list. - + Closes: #8785 Reviewed-by: Daniel Stenberg <daniel@haxx.se> @@ -295,7 +2017,7 @@ Daniel Stenberg (2 May 2022) - [Philip H brought this change] misc: use "autoreconf -fi" instead buildconf - + Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> Closes #8777 @@ -303,69 +2025,69 @@ Daniel Gustafsson (2 May 2022) - [Philip H brought this change] cirrus: Use pip for Python packages on FreeBSD - + Using pip instead of easy_install is more in line with how other CI images are being maintained. - + Closes: #8783 Reviewed-by: Daniel Gustafsson <daniel@yesql.se> - [Philip H brought this change] cirrus: Update to FreeBSD 12.3 - + Closes: #8783 Reviewed-by: Daniel Gustafsson <daniel@yesql.se> - tool_getparam: simplify conditional statement - + param_place cannot be NULL here since we immediately efter this block perform arithmetic on it (and use it in order to get here) so there is little reason to check. - + Closes: #8786 Reviewed-by: Daniel Stenberg <daniel@haxx.se> - RELEASE-NOTES: synced - gskit: remove unused function set_callback - + This function has been unused since the initial commit of the GSKit backend in 0eba02fd4. The motivation for the code was getting the whole certificate chain: the only place where the latter is available is as a callback parameter. Unfortunately it is not possible to pass a user pointer to this callback, which precludes the possibility to associate the cert chain with a data/conn structure. - + For further information, search for pgsk_cert_validation_callback on: https://www.ibm.com/docs/api/v1/content/ssw_ibm_i_71/apis/gsk_attribute_set_callback.htm - + As the upstream library never added a parameter like that to the API, we give up the wait and remove the dead code. - + Closes: #8782 Reviewed-by: Patrick Monnerat <patrick@monnerat.net> - curl: free resource in error path - + If the new filename cannot be generated due to memory pressure, free the allocated aname on the way out to avoid a small leak. - + Closes: #8770 Reviewed-by: Daniel Stenberg <daniel@haxx.se> - curl: guard against size_t wraparound in no-clobber code - + When generating the new filename, make sure we aren't overflowing the size_t limit when calculating the new length. This is mostly academic but good code hygeine nonetheless. - + Closes: #8771 Reviewed-by: Daniel Stenberg <daniel@haxx.se> Daniel Stenberg (30 Apr 2022) - gha: build msh3 - + Closes #8779 - scripts/cijobs.pl: try "current branch" first then "master" @@ -373,45 +2095,45 @@ Daniel Stenberg (30 Apr 2022) - [Yusuke Nakamura brought this change] msh3: get msh3 version from MsH3Version - + Closes #8762 - [Yusuke Nakamura brought this change] msh3: psss remote_port to MsH3ConnectionOpen - + MsH3 supported additional "Port" parameter to connect not hosted on 443 port QUIC website. - + * https://github.com/nibanks/msh3/releases/tag/v0.3.0 * https://github.com/nibanks/msh3/pull/37 - + Closes #8762 - [Christian Weisgerber brought this change] openssl: define HAVE_SSL_CTX_SET_EC_CURVES for libressl - + SSL_CTX_set1_curves_list() has been available since LibreSSL 2.5.3, released five years ago. - + Bug: https://curl.se/mail/lib-2022-04/0059.html Closes #8773 - http: move Curl_allow_auth_to_host() - + It was mistakenly put within the CURL_DISABLE_HTTP_AUTH #ifdef - + Reported-by: Michael Olbrich Fixes #8772 Closes #8775 Daniel Gustafsson (29 Apr 2022) - msh3: print boolean value as text representation - + Print the boolean value as its string representation instead of with %hhu which isn't a format we typically use. - + Closes: #8763 Reviewed-by: Nick Banks <nibanks@microsoft.com> @@ -419,84 +2141,84 @@ Daniel Stenberg (29 Apr 2022) - data/test376: set a proper name - GHA/mbedtls: enabled nghttp2 in the build - + Closes #8767 - mbedtls: fix compile when h2-enabled - + Fixes #8766 Reported-by: LigH-de on github Closes #8768 - RELEASE-NOTES: synced - + bumped curlver to 7.83.1-dev - SECURITY-PROCESS: extended - + Also clarify BUG-BOUNTY.md with IBB details. - + Closes #8754 - [Adam Rosenfield brought this change] conn: fix typo 'connnection' -> 'connection' in two function names - + Closes #8759 Version 7.83.0 (27 Apr 2022) Daniel Stenberg (27 Apr 2022) - RELEASE-NOTES: synced - + The 7.83.0 release - docs/THANKS: contributors from 7.83.0 - test 898/974/976: require proxy to run - + Fixes #8755 Reported-by: Marc Hörsken Closes #8756 - gnutls: don't leak the SRP credentials in redirects - + Follow-up to 620ea21410030 and 139a54ed0a172a - + Reported-by: Harry Sintonen Closes #8752 - CURLOPT*TLSAUTH: they only work with OpenSSL or GnuTLS - + Closes #8753 - openssl: don't leak the SRP credentials in redirects either - + Follow-up to 620ea21410030 - + Reported-by: Harry Sintonen Closes #8751 - [Liam Warfield brought this change] hyper: fix tests 580 and 581 for hyper - + Hyper now has the ability to preserve header order. This commit adds a few lines setting the connection options for this feature. - + Related to issue #8617 Closes #8707 - conncache: remove name arg from Curl_conncache_find_bundle - + To simplify, and also since the returned name is not the full actual name used for the check. The port number and zone id is also involved, so just showing the name is misleading. - + Closes #8750 - tests: verify the fix for CVE-2022-27774 - + - Test 973 redirects from HTTP to FTP, clear auth - Test 974 redirects from HTTP to HTTP different port, clear auth - Test 975 redirects from HTTP to FTP, permitted to keep auth @@ -504,46 +2226,46 @@ Daniel Stenberg (27 Apr 2022) auth - transfer: redirects to other protocols or ports clear auth - + ... unless explicitly permitted. - + Bug: https://curl.se/docs/CVE-2022-27774.html Reported-by: Harry Sintonen Closes #8748 - connect: store "conn_remote_port" in the info struct - + To make it available after the connection ended. - cookie.d: clarify when cookies are always sent - test898: verify the fix for CVE-2022-27776 - + Do not pass on Authorization headers on redirects to another port - http: avoid auth/cookie on redirects same host diff port - + CVE-2022-27776 - + Reported-by: Harry Sintonen Bug: https://curl.se/docs/CVE-2022-27776.html Closes #8749 - libssh2: make the md5 comparison fail if wrong length - + Making it just skip the check unless exactly 32 is too brittle. Even if the docs says it needs to be exactly 32, it is be safer to make the comparison fail here instead. - + Reported-by: Harry Sintonen Bug: https://hackerone.com/reports/1549461 Closes #8745 - conncache: include the zone id in the "bundle" hashkey - + Make connections to two separate IPv6 zone ids create separate connections. - + Reported-by: Harry Sintonen Bug: https://curl.se/docs/CVE-2022-27775.html Closes #8747 @@ -551,26 +2273,26 @@ Daniel Stenberg (27 Apr 2022) - [Patrick Monnerat brought this change] url: check sasl additional parameters for connection reuse. - + Also move static function safecmp() as non-static Curl_safecmp() since its purpose is needed at several places. - + Bug: https://curl.se/docs/CVE-2022-22576.html - + CVE-2022-22576 - + Closes #8746 - libssh2: compare sha256 strings case sensitively - + Reported-by: Harry Sintonen Bug: https://hackerone.com/reports/1549435 Closes #8744 - tool_getparam: error out on missing -K file - + Add test 411 to verify. - + Reported-by: Median Median Stride Bug: https://hackerone.com/reports/1542881 Closes #8731 @@ -578,16 +2300,16 @@ Daniel Stenberg (27 Apr 2022) - [Tatsuhiro Tsujikawa brought this change] ngtcp2: deal with sub-millisecond timeout - + Closes #8738 - misc: update copyright year ranges - c_escape: escape '?' in generated --libcurl code - + In order to avoid the risk of it being used in an accidental trigraph in the generated code. - + Reported-by: Harry Sintonen Bug: https://hackerone.com/reports/1548535 Closes #8742 @@ -595,67 +2317,67 @@ Daniel Stenberg (27 Apr 2022) - [Philip H brought this change] mlc: curl.zuul.vexxhost.dev is reachable again - + remove it from ignorelist for linkcheck - + Closes #8736 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: avoid busy loop in low CWND situation - + Closes #8739 - TODO: telnet - exit immediately upon connection if stdin is /dev/null - + Suggested-by: Robin A. Meade URL: https://curl.se/mail/archive-2022-04/0027.html - [Kushal Das brought this change] docs: updates spellings with full words - + Closes #8730 - tests/FILEFORMAT.md: spellfix Daniel Gustafsson (21 Apr 2022) - misc: fix typos - + Fix a few random typos is comments and workflow names. - macos: fix .plist installation into framework - + The copy command introduced in e498a9b1f had leftover '>' from the previous sed command it replaced, which broke its syntax. Fix by removing. - + Reported-by: Emanuele Torre <torreemanuele6@gmail.com> Daniel Stenberg (21 Apr 2022) - [Christopher Degawa brought this change] Makefile: fix ca-bundle due to mk-ca-bundle.pl being moved - + The script was moved in 8e22fc68e7dda43e9f but the lines that called it was not changed to reflect it's new position - + Signed-off-by: Christopher Degawa <ccom@randomderp.com> - + Closes #8728 Daniel Gustafsson (20 Apr 2022) - macos: set .plist version in autoconf - + Set the libcurl version in libcurl.plist like how libcurl.vers is created. - + Closes: #8692 Reviewed-by: Daniel Stenberg <daniel@haxx.se> Reviewed-by: Nick Zitzmann <nickzman@gmail.com> - cookies: Improve errorhandling for reading cookiefile - + The existing programming had some issues with errorhandling for reading the cookie file. If the file failed to open, we would silently ignore it and continue as if there was no file (or stdin) passed. In this case, we @@ -664,7 +2386,7 @@ Daniel Gustafsson (20 Apr 2022) fclose on it, and issue a warning in case the file cannot be opened. Erroring out on nonexisting file would break backwards compatibility of very old behavior so we can't really go there. - + Closes: #8699 Reviewed-by: Daniel Stenberg <daniel@haxx.se> Reviewed-by: Jay Satiro <raysatiro@yahoo.com> @@ -673,16 +2395,16 @@ Daniel Stenberg (20 Apr 2022) - libcurl-tutorial.3: spellfix and minor polish - CURLINFO_PRIMARY_PORT.3: spellfix - + Reported-by: Patrick Monnerat - [Jay Dommaschk brought this change] libssh: fix double close - + libssh closes the socket in ssh_diconnect() so make sure that libcurl does not also close it. - + Fixes #8708 Closes #8718 @@ -690,34 +2412,34 @@ Jay Satiro (20 Apr 2022) - [Gisle Vanem brought this change] unit1620: call global_init before calling Curl_open - + Curl_open calls the resolver init and on Windows if the resolver backend is c-ares then the Windows sockets library (winsock) must already have been initialized (via global init). - + Ref: https://github.com/curl/curl/pull/8540#issuecomment-1059771800 - + Closes https://github.com/curl/curl/pull/8719 Daniel Stenberg (19 Apr 2022) - CURLINFO_PRIMARY_PORT.3: clarify which port this is - + As it was not entirely clear previously. - + Closes #8725 - CURLOPT_UNRESTRICTED_AUTH.3: extended explanation - + Include details about Authentication headers. - + Reported-by: Brad Spencer Fixes #8724 Closes #8726 - .github/workflows/macos.yml: add a libssh job with c-ares - + ... to enable the memdebug system - + Closes #8720 - RELEASE-NOTES: synced @@ -726,20 +2448,20 @@ Jay Satiro (17 Apr 2022) - [Gisle Vanem brought this change] docs/HTTP3.md: fix typo - + also fix msh3 section formatting - + Ref: https://github.com/curl/curl/commit/37492ebb#r70980087 Marc Hoersken (17 Apr 2022) - timediff.[ch]: add curlx helper functions for timeval conversions - + Also move timediff_t definitions from timeval.h to timediff.h and then make timeval.h include the new standalone-capable timediff.h. - + Reviewed-by: Jay Satiro Reviewed-by: Daniel Stenberg - + Supersedes #5888 Closes #8595 @@ -747,16 +2469,16 @@ Daniel Stenberg (17 Apr 2022) - [Balakrishnan Balasubramanian brought this change] tests: refactor server/socksd.c to support --unix-socket - + Closes #8687 - [Emanuele Torre brought this change] tool_paramhlp: use feof(3) to identify EOF correctly when using fread(3) - + This loop was using the number of bytes read from the file as condition to keep reading. - + From Linux's fread(3) man page: > On success, fread() and fwrite() return the number of items read or > written. This number equals the number of bytes transferred only when @@ -768,21 +2490,21 @@ Daniel Stenberg (17 Apr 2022) > > fread() does not distinguish between end-of-file and error, and > callers must use feof(3) and ferror(3) to determine which occurred. - + This means that nread!=0 doesn't make much sense as an end condition for the loop: nread==0 doesn't necessarily mean that EOF has been reached or an error has occured (but that is usually the case) and nread!=0 doesn't necessarily mean that EOF has not been reached or that no read errors have occured. feof(3) and ferror(3) should be uses when using fread(3). - + Currently curl has to performs an extra fread(3) call to get a return value equal to 0 to stop looping. - + This usually "works" (even though nread==0 shouldn't be interpreted as EOF) if stdin is a pipe because EOF usually marks the "real" end of the stream, so the extra fread(3) call will return immediately and the extra read syscall won't be noticeable: - + bash-5.1$ strace -e read curl -s -F file=@- 0x0.st <<< a 2>&1 | > tail -n 5 read(0, "a\n", 4096) = 2 @@ -791,89 +2513,89 @@ Daniel Stenberg (17 Apr 2022) http://0x0.st/oRs.txt +++ exited with 0 +++ bash-5.1$ - + But this doesn't work if curl is reading from stdin, stdin is a terminal, and the EOF is being emulated using a shell with ^D. Two consecutive ^D will be required in this case to actually make curl stop reading: - + bash-5.1$ curl -F file=@- 0x0.st a ^D^D http://0x0.st/oRs.txt bash-5.1$ - + A possible workaround to this issue is to use a program that handles EOF correctly to indirectly send data to curl's stdin: - + bash-5.1$ cat - | curl -F file=@- 0x0.st a ^D http://0x0.st/oRs.txt bash-5.1$ - + This patch makes curl handle EOF properly when using fread(3) in file2memory() so that the workaround is not necessary. - + Since curl was previously ignoring read errors caused by this fread(3), ferror(3) is also used in the condition of the loop: read errors and EOF will have the same meaning; this is done to somewhat preserve the old behaviour instead of making the command fail when a read error occurs. - + Closes #8701 - gen.pl: change wording for mutexed options - + Instead of saying "This option overrides NNN", now say "This option is mutually exclusive to NNN" in the generated man page ouput, as the option does not in all cases actually override the others but they are always mutually exclusive. - + Ref: #8704 Closes #8716 - curl: error out if -T and -d are used for the same URL - + As one implies PUT and the other POST, both cannot be used simultaneously. - + Add test 378 to verify. - + Reported-by: Boris Verkhovskiy Fixes #8704 Closes #8715 - lib: remove exclamation marks - + ... from infof() and failf() calls. Make them less attention seeking. - + Closes #8713 - fail.d: tweak the description - + Reviewed-by: Daniel Gustafsson Suggested-by: Robert Charles Muir Ref: https://twitter.com/rcmuir/status/1514915401574010887 - + Closes #8714 Daniel Gustafsson (15 Apr 2022) - docs: Fix missing semicolon in example code - + Multiple share examples were missing a semicolon on the line defining the CURLSHcode variable. - + Closes: #8697 Reported-by: Michael Kaufmann <mail@michael-kaufmann.ch> Reviewed-by: Daniel Stenberg <daniel@haxx.se> - infof: consistent capitalization of warning messages - + Ensure that all infof calls with a warning message are capitalized in the same way. At some point we should probably set up a style- guide for infof but until then let's aim for a little consistenncy where we can. - + Closes: #8711 Reviewed-by: Daniel Stenberg <daniel@haxx.se> @@ -882,140 +2604,140 @@ Daniel Gustafsson (15 Apr 2022) - [Matteo Baccan brought this change] perl: removed a double semicolon at end of line - + Remove double semicolons at end of line in Perl code. - + Closes: #8709 Reviewed-by: Daniel Gustafsson <daniel@yesql.se> - curl_easy_header: fix typos in documentation - + Closes: #8694 Reviewed-by: Daniel Stenberg <daniel@haxx.se> Marcel Raad (11 Apr 2022) - appveyor: add Cygwin build - + Closes https://github.com/curl/curl/pull/8693 - appveyor: only add MSYS2 to PATH where required - + Closes https://github.com/curl/curl/pull/8693 Daniel Stenberg (10 Apr 2022) - [Tatsuhiro Tsujikawa brought this change] ngtcp2: fix memory leak - + Closes #8691 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: remove remote_addr which is not used in a meaningful way - + Closes #8689 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: enlarge H3_SEND_SIZE - + Make h3_SEND_SIZE larger because current value (20KiB) is too small for the high latency environment. - + Closes #8690 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: fix HTTP/3 upload stall and avoid busy loop - + This commit fixes HTTP/3 upload stall if upload data is larger than H3_SEND_SIZE. Only check writability of socket if a stream is writable to avoid busy loop when QUIC flow control window is filled up, or upload buffer is full. - + Closes #8688 - [Nick Banks brought this change] msh3: add support for QUIC and HTTP/3 using msh3 - + Considered experimental, as the other HTTP/3 backends. - + Closes #8517 - TODO: "SFTP with SCP://" - GHA: move bearssl jobs over from zuul - + Closes #8684 - data/DISABLED: disable test 313 on bearssl builds - + Closes #8684 - runtests: add 'bearssl' as testable feature - + Closes #8684 - GHA: add openssl3 jobs moved over from zuul - + Closes #8683 - schannel: remove dead code that will never run - + As the condition can't ever evaluate true - + Reported-by: Andrey Alifanov Ref: #8675 Closes #8677 - connecache: remove duplicate connc->closure_handle check - + The superfluous extra check could cause analyzer false positives and doesn't serve any purpose. - + Closes #8676 - [Michał Antoniak brought this change] mbedtls: remove server_fd from backend - + Closes #8682 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: use token when detecting :status header field - + Closes #8679 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: make curl 1ms faster - + Pass 0 for an already expired timer. - + Closes #8678 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: fix QUIC_IDLE_TIMEOUT - + QUIC_IDLE_TIMEOUT should be of type ngtcp2_duration which is nanoseconds resolution. - + Closes #8678 - English: use American spelling consistently - + Authorization, Initialization, Organization etc. - + Closes #8673 Daniel Gustafsson (5 Apr 2022) - [Sascha Zengler brought this change] BUGS: Fix incorrect punctuation - + Closes #8672 Reviewed-by: Daniel Gustafsson <daniel@yesql.se> @@ -1025,135 +2747,135 @@ Daniel Stenberg (4 Apr 2022) - RELEASE-NOTES: synced - http: streamclose "already downloaded" - + Instead of connclose()ing, since when HTTP/2 is used it doesn't need to close the connection as stopping the current transfer is enough. - + Reported-by: Evangelos Foutras Closes #8665 Jay Satiro (1 Apr 2022) - ftp: fix error message for partial file upload - + - Show the count of bytes written on partial file upload. - + Prior to this change the error message mistakenly showed the count of bytes read, not written. - + Bug: https://github.com/curl/curl/discussions/8637 Reported-by: Taras Kushnir - + Closes https://github.com/curl/curl/pull/8649 Daniel Stenberg (1 Apr 2022) - http: correct the header error message to say colon - + Not semicolon - + Reported-by: Gisle Vanem Ref: #8666 Closes #8667 - lib: #ifdef on USE_HTTP2 better - + ... as nghttp2 might not be the library that provides HTTP/2 support. - + Closes #8661 - [Michał Antoniak brought this change] mbedtls: remove 'protocols' array from backend when ALPN is not used - + Closes #8663 - http2: RST the stream if we stop it on our own will - + For the "simulated 304" case the done-call isn't considered "premature" but since the server didn't close the stream it needs to be reset to stop delivering data. - + Closes #8664 - http: close the stream (not connection) on time condition abort - + Closes #8664 - http2: handle DONE called for the paused stream - + As it could otherwise stall all streams on the connection - + Reported-by: Evangelos Foutras Fixes #8626 Closes #8664 - tls: make mbedtls and NSS check for h2, not nghttp2 - + This makes them able to also negotiate HTTP/2 even when built to use hyper for h2. - + Closes #8656 - tests/libtest/lib670.c: fixup the copyright year range - + follow-up to b54e18640ea4b7 - [Leandro Coutinho brought this change] lib670: avoid double check result - + Closes #8660 - vtls: use a generic "ALPN, server accepted" message - + Closes #8657 - vtls: use a backend standard message for "ALPN: offers %s" - + I call it VTLS_INFOF_ALPN_OFFER_1STR, the '1str' meaning that the infof() call also needs a string argument: the ALPN ID. - + Closes #8657 - [Christian Schmitz brought this change] strcase.h: add comment about the return code - + Tool often we run into expecting this to work like strcmp, but it returns 1 instead of 0 for match. - + Closes #8658 - vtls: provide a unified APLN-disagree string for all backends - + Also rephrase to make it sound less dangerous: - + "ALPN: server did not agree on a protocol. Uses default." - + Reported-by: Nick Coghlan Fixes #8643 Closes #8651 - projects/README: converted to markdown - + Closes #8652 - misc: spelling fixes - + Mostly in comments but also in the -w documentation for headers_json. - + Closes #8647 - KNOW_BUGS: HTTP3/Transfer closed with n bytes remaining to read - + "HTTP/3 does not support client certs" considered fixed, at least with the ngtcp2 backend. - + Closes #8523 - CURLOPT_PREQUOTE.3: only works for FTP file transfers, not dirs - + Also add to quote.d. Add to TODO as something to add in a future. - + Reported-by: anon00000000 on github Closes #8602 Closes #8648 @@ -1161,51 +2883,51 @@ Daniel Stenberg (1 Apr 2022) - RELEASE-NOTES: synced - pop3/smtp: return *WEIRD_SERVER_REPLY when not understood - + This leaves the CURLE_RECV_ERROR error code for explicit failure to receive network data and allows users to better separate the problems. - + Ref #8356 Reported-by: Rianov Viacheslav Closes #8506 - docs: lots of minor language polish - + Mostly based on recent language decisions from "everything curl": - + - remove contractions (isn't => is not) - *an* HTTP (consistency) - runtime (no hyphen) - backend (no hyphen) - URL is uppercase - + Closes #8646 Jay Satiro (29 Mar 2022) - projects: Update VC version names for VS2017, VS2022 - + - Rename VC15 -> VC14.10, VC17 -> VC14.30. - + The projects directory that holds the pre-generated Visual Studio project files uses VC<ver> to indicate the MSVC version. At some point support for Visual Studio 2017 (Visual Studio version 15 which uses MSVC 14.10) was added as VC15. Visual Studio 2022 (Visual Studio version 17 which uses MSVC 14.30) project files were recently added and followed that same format using VC17. - + There is no such MSVC version (yet) as VC15 or VC17. - + For VS 2017 for example, the name we use is correct as either VS17, VS2017, VC14.10. I opted for the latter since we use VC for earlier versions (eg VC10, VC12, etc). - + Ref: https://github.com/curl/curl/pull/8438#issuecomment-1037070192 - + Closes https://github.com/curl/curl/pull/8447 Daniel Stenberg (29 Mar 2022) - mqtt: better handling of TCP disconnect mid-message - + Reported-by: Jenny Heino Bug: https://hackerone.com/reports/1521610 Closes #8644 @@ -1215,27 +2937,27 @@ Daniel Stenberg (29 Mar 2022) - [Ian Blanes brought this change] docs/DYNBUF: clarify documentation for Curl_dyn_ptr and Curl_dyn_uptr - + Closes #8606 - [Ian Blanes brought this change] curl: fix segmentation fault for empty output file names. - + Function glob_match_url set *result to NULL when called with filename = "", producing an indirect NULL pointer dereference. - + Closes #8606 - TODO: Read keys from ~/.ssh/id_ecdsa, id_ed25519 - + It would be nice to expand the list of key locations curl uses for the newer key types supported by libssh2. - + Closes #8586 - ngtcp2: update to work after recent ngtcp2 updates - + Assisted-by: Tatsuhiro Tsujikawa Reported-by: jurisuk on github Fixes #8638 @@ -1244,13 +2966,13 @@ Daniel Stenberg (29 Mar 2022) - [Farzin brought this change] CURLOPT_PROGRESSFUNCTION.3: fix typo in example - + Closes #8636 - curl/header_json: output the header names in lowercase - + To better allow json[“header”]. - + Reported-by: Peter Korsgaard Bug: https://daniel.haxx.se/blog/2022/03/24/easier-header-picking-with-curl/comment-page-1/#comment-25878 Closes #8633 @@ -1258,127 +2980,127 @@ Daniel Stenberg (29 Mar 2022) - RELEASE-NOTES: synced - headers.h: make Curl_headers_push() be CURLE_OK when not built - + ... to avoid errors when the function isn't there. - + Reported-by: Marcel Raad Fixes #8627 Closes #8628 - scripts: move three scripts from lib/ to scripts/ - + Move checksrc.pl, firefox-db2pem.sh and mk-ca-bundle.pl since they don't particularly belong in lib/ - + Also created an EXTRA_DIST= in scripts/Makefile.am instead of specifying those files in the root Makefile.am - + Closes #8625 Marc Hoersken (23 Mar 2022) - lib/warnless.[ch]: only check for WIN32 and ignore _WIN32 - + curl_setup.h automatically defines WIN32 if just _WIN32 is defined. - + Therefore make sure curl_setup.h is included through warnless.h. - + Reviewed-by: Daniel Stenberg Reviewed-by: Jay Satiro - + Closes #8594 - tests/server/util.h: align WIN32 condition with util.c - + There is no need to test for both _WIN32 and WIN32 as curl_setup.h automatically defines the later if the first one is defined. - + Also tests/server/util.c is only checking for WIN32 arouund the implementation of win32_perror, so just defining _WIN32 would not be sufficient for a successful compilation. - + Reviewed-by: Daniel Stenberg Reviewed-by: Jay Satiro - + Closes #8594 Daniel Stenberg (22 Mar 2022) - [Philip H brought this change] firefox-db2pem.sh: make the shell script safer - + Reported by lift - + Closes #8616 Jay Satiro (22 Mar 2022) - gtls: fix build for disabled TLS-SRP - + Prior to this change if, at build time, the GnuTLS backend was found to have TLS-SRP support (HAVE_GNUTLS_SRP) but TLS-SRP was disabled in curl via --disable-tls-srp (!USE_TLS_SRP) then a build error would occur. - + Bug: https://curl.se/mail/lib-2022-03/0046.html Reported-by: Robert Brose - + Closes https://github.com/curl/curl/pull/8604 - winbuild: Add a Visual Studio example to the README - + - Add an example that explains in detail how the user can add libcurl to their Visual Studio project. - + Ref: https://github.com/curl/curl/issues/8591 - + Closes https://github.com/curl/curl/pull/8592 - docs/opts: Mention Schannel client cert type is P12 - + Schannel backend code behaves same as Secure Transport, it expects a P12 certificate file or the name of a certificate already in the user's OS key store. Also, both backends ignore CURLOPT_SSLKEY (tool: --key) because they expect the private key to already be available from the keystore or P12 certificate. - + Ref: https://github.com/curl/curl/discussions/8581#discussioncomment-2337260 - + Closes https://github.com/curl/curl/pull/8587 Daniel Stenberg (22 Mar 2022) - lib1945: fix compiler warning 4706 on MSVC - + Follow-up from d1e4a677340c - + Closes #8623 - [Philip H brought this change] ci/event-based.yml: improve impacket install - + skip python3-pip install impacket with library module - + Closes #8621 - test1459: disable for oldlibssh - + This test with libssh 0.9.3 works fine on github but fails on circleci. Might as well disable this test for oldlibssh installations. - + Closes #8622 - test1135: sync with recent API updates - + This test verifies that the order of functions in public headers remain the same but hasn't been updated to care for recently added header files. The order is important for some few platforms - or VERSIONINFO needs to updated. - + This fix also updates VERSIONINFO to be sure. - + Closes #8620 - curl_easy_nextheader.3: fix two typos - + Reported-by: Timothe Litt Bug: https://curl.se/mail/lib-2022-03/0060.html @@ -1391,9 +3113,9 @@ Daniel Stenberg (22 Mar 2022) - lib: make the headers API depend on --enable-headers-api - configure: add --enable-headers-api to enable the headers API - + Defaults to disabled while labeled EXPERIMENTAL. - + Make all the headers API tests require 'headers-api' to run. - test1671: verify -w '%{header_json} @@ -1401,63 +3123,63 @@ Daniel Stenberg (22 Mar 2022) - test1670: verify -w %header{} - curl: add %{header_json} support in -w handling - + Outputs all response headers as a JSON object. - curl: add %header{name} support in -w handling - + Outputs the response header 'name' - header api: add curl_easy_header and curl_easy_nextheader - + Add test 1940 to 1946 to verify. - + Closes #8593 - test1459: remove the different exit code for oldlibssh - + When using libssh/0.9.3/openssl/zlib, we seem to be getting the "right" error code. - + Closes #8490 - libssh: unstick SFTP transfers when done event-based - + Test 604 and 606 (at least). - + Closes #8490 - gha: move the event-based test over from Zuul - + Switched libssh2 to libssh - + Closes #8490 - RELEASE-NOTES: synced - http: return error on colon-less HTTP headers - + It's a protocol violation and accepting them leads to no good. - + Add test case 398 to verify - + Closes #8610 - test718: edited slightly to return better HTTP - + Since hyper is picky and won't play ball otherwise. - + Bug: https://github.com/hyperium/hyper/issues/2783 Reported-by: Daniel Valenzuela Closes #8614 - hyper: no h2c support - + Make tests require h2c feature present to run, and only set h2c if nghttp2 is used in the build. Hyper does not support it. - + Remove those tests from DISABLED - + Fixes #8605 Closes #8613 @@ -1466,7 +3188,7 @@ Daniel Stenberg (22 Mar 2022) - [Andreas Falkenhahn brought this change] BINDINGS.md: add Hollywood binding - + Closes #8609 - HISTORY: add some 2022 data @@ -1476,121 +3198,121 @@ Daniel Stenberg (22 Mar 2022) - [Philip H brought this change] mlc_config.json: add file to ignore known troublesome URLs - + This is the config file for the CI markdown link checker and lets us filter URLs that are known to cause problems. Like https://curl.zuul.vexxhost.dev/ for now. - + Closes #8597 - [Philip H brought this change] winbuild/README.md: fixup dead link - + Closes #8597 Jay Satiro (18 Mar 2022) - rtsp: don't let CSeq error override earlier errors - + - When done, if an error has already occurred then don't check the sequence numbers for mismatch. - + A sequence number may not have been received if an error occurred. - + Prior to this change a sequence mismatch error would override earlier errors. For example, a server that returns nothing would cause error CURLE_GOT_NOTHING in Curl_http_done which was then overridden by CURLE_RTSP_CSEQ_ERROR in rtsp_done. - + Closes https://github.com/curl/curl/pull/8525 - lib: fix some misuse of curlx_convert_wchar_to_UTF8 - + curlx_convert_wchar_to_UTF8 must be freed by curlx_unicodefree, but prior to this change some uses mistakenly called free. - + I've reviewed all other uses of curlx_convert_wchar_to_UTF8 and curlx_convert_UTF8_to_wchar. - + Ref: https://github.com/curl/curl/commit/1d5d0ae - + Closes https://github.com/curl/curl/pull/8521 - mk-ca-bundle.pl: Use stricter logic to process the certificates - + .. and bump version to 1.29. - + This change makes the script properly ignore unknown blocks and otherwise fail when Mozilla changes the certdata format in ways we don't expect. Though this is less flexible behavior it makes it far less likely that an invalid certificate can slip through. - + Prior to this change the state machine did not always properly reset, and it was possible that a certificate marked as invalid could then later be marked as valid when there was conflicting trust info or an unknown block was erroneously processed as part of the certificate. - + Ref: https://github.com/curl/curl/pull/7801#pullrequestreview-768384569 - + Closes https://github.com/curl/curl/pull/8411 Marcel Raad (17 Mar 2022) - test375: fix line endings on Windows - + Closes https://github.com/curl/curl/pull/8599 Daniel Stenberg (17 Mar 2022) - http: reject header contents with nul bytes - + They are not allowed by the protocol and allowing them risk that curl misbehaves somewhere where C functions are used but won't work on the full contents. Further, they are not supported by hyper and they cause problems for the new coming headers API work. - + Updated test 262 to verify and enabled it for hyper as well - + Closes #8601 - [Philip H brought this change] CI: Do not use buildconf. Instead, just use: autoreconf -fi - + Closes #8596 - RELEASE-NOTES: synced Jay Satiro (14 Mar 2022) - libssh: Improve fix for missing SSH_S_ stat macros - + - If building libcurl against an old libssh version missing SSH_S_IFMT and SSH_S_IFLNK then use the values from a supported version. - + Prior to this change if libssh did not define SSH_S_IFMT and SSH_S_IFLNK then S_IFMT and S_IFLNK, respectively, were used instead. The problem with that is the user's S_ stat macros don't have the same values across platforms. For example Windows has values different from Linux. - + Follow-up to 7b0fd39. - + Ref: https://github.com/curl/curl/pull/8511#discussion_r815292391 Ref: https://github.com/curl/curl/pull/8574 - + Closes https://github.com/curl/curl/pull/8588 Marc Hoersken (13 Mar 2022) - tool and tests: force flush of all buffers at end of program - + On Windows data can be lost in buffers in case of abnormal program termination, especially in process chains as seen due to flaky tests. Therefore flushing all buffers manually should avoid this data loss. - + In the curl tool we play the safe game by only flushing write buffers, but in the testsuite where we manage all buffers, we flush everything. - + This should drastically reduce Windows CI and testsuite flakiness. - + Reviewed-by: Daniel Stenberg - + Supersedes #7833 and #6064 Closes #8516 @@ -1598,18 +3320,18 @@ Daniel Stenberg (12 Mar 2022) - [Jan Venekamp brought this change] BearSSL: add CURLOPT_SSL_CTX_FUNCTION support - + Closes #8478 - [Jan Venekamp brought this change] BearSSL: add CURLOPT_SSL_CIPHER_LIST support - + Closes #8477 Dan Fandrich (11 Mar 2022) - tool_cb_hdr: Turn the Location: into a terminal hyperlink - + This turns even relative URLs into clickable hyperlinks in a supported terminal when --styled-output is enabled. Many terminals already turn URLs into clickable links but there is not enough information in a @@ -1621,119 +3343,119 @@ Daniel Stenberg (11 Mar 2022) - [HexTheDragon brought this change] curl: add --no-clobber - + Does not overwrite output files if they already exist - + Closes #7708 Co-authored-by: Daniel Stenberg - RELEASE-NOTES: synced - + also bump next pending version to become 7.83.0 - [Jean-Philippe Menil brought this change] openssl: check SSL_get_peer_cert_chain return value - + Signed-off-by: Jean-Philippe Menil <jpmenil@gmail.com> Closes #8579 - [Jay Satiro brought this change] mk-ca-bundle.vbs: delete this script in favor of mk-ca-bundle.pl - + mk-ca-bundle.vbs is a Windows-specific script for Mozilla certificate extraction, similar to mk-ca-bundle.pl which runs on any platform. The vbs version has not been maintained while the perl version has been maintained with improvements and security fixes. I don't think it's worth the work to maintain both versions. Windows users should be able to use mk-ca-bundle.pl without any problems, as long as they have perl. - + Closes #8412 - CURLSHOPT_UNLOCKFUNC.3: fix the callback prototype - + Copy and paste error - + Reported-by: Francisco Olarte Fixes #8573 Closes #8577 - remove-on-error.d: typo - + Reported-by: Colin Leroy Bug: https://github.com/curl/curl/pull/8503#pullrequestreview-906520081 - curl: add --remove-on-error - + If a transfer returns an error, using this option makes curl remove the leftover downloded (partial) local file before exiting. - + Added test 376 to verify - + Closes #8503 - libssh: fix build with old libssh versions - + ... that don't have the SSH_S_* defines. Spotted on a machine using libssh 0.7.3 - + Closes #8574 - hyper: fix status_line() return code - + Detected while working on #7708 that happened to trigger an error here with a new test case. - + Closes #8572 - [Alejandro R. Sedeño brought this change] configure.ac: move -pthread CFLAGS setting back where it used to be - + The fix for #8276 proposed in #8374 set `CFLAGS="$CFLAGS -pthead"` earlier than it used to be set, applying it in cases where it should not have been applied. - + This moves the AIX XLC check to a new `case $host in` block inside of the `if test "$USE_THREADS_POSIX" != "1"` block, where `CFLAGS="$CFLAGS -pthead"` used to happen. - + Fixes #8541 Closes #8542 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: add client certificate authentication for OpenSSL - + Closes #8522 - tool_operate: fix a scan-build warning - + ... and avoid the temp storing of the return code in a diff variable. - + Closes #8565 - test375: verify that --proxy errors out if proxy is disabled in the build - + Closes #8565 - curl: error out when options need features not present in libcurl - + Trying to use a proxy when libcurl was built with proxy support disabled should make curl error out properly. - + Remove knowledge of disabled features from the tool code and instead make it properly respond to what libcurl returns. Update all tests to properly require the necessary features to be present/absent so that the test suite can still be run even with libcurl builds with disabled features. - + Ref: https://curl.se/mail/archive-2022-03/0013.html Closes #8565 - ngtcp2: disconnect the QUIC connection proper - + Reported-by: mehatzri on github Reviewed-by: Tatsuhiro Tsujikawa Fixes #8534 @@ -1746,19 +3468,19 @@ Daniel Stenberg (9 Mar 2022) - [Don J Olmstead brought this change] nonblock: restore setsockopt method to curlx_nonblock - + The implementation using setsockopt was removed when BeOS support was purged. However this functionality wasn't BeOS specific, it is still used by for example Orbis OS (Playstation 4/5 OS). - + Closes #8562 - openssl: fix CN check error code - + Due to a missing 'else' this returns error too easily. - + Regressed in: d15692ebb - + Reported-by: Kristoffer Gleditsch Fixes #8559 Closes #8560 @@ -1766,82 +3488,82 @@ Daniel Stenberg (9 Mar 2022) - [Frank Meier brought this change] connect: make Curl_getconnectinfo work with conn cache from share handle - + Closes #8524 - [lwthiker brought this change] openssl: enable CURLOPT_SSL_EC_CURVES with BoringSSL - + The CURLOPT_SSL_EC_CURVES option (used by the '--curves' flag) in libcurl was ignored when compiling with BoringSSL because HAVE_SSL_CTX_SET_EC_CURVES was explicitly disabled if BoringSSL was detected. However, this feature is supported in BoringSSL since 5fd1807d. This commit enables it, and also reduces the required minimal OpenSSL version to 1.0.2 as per OpenSSL's official documentation. - + Fixes #8553 Closes #8556 - [Samuel Henrique brought this change] json.d: fix typo (overriden -> overridden) - + Closes #8557 - wolfssl: fix compiler error without IPv6 - + Reported-by: Joseph Chen Fixes #8550 Closes #8552 - RELEASE-NOTES: synced - + and bump pending version to 7.82.1 - [Paul Howarth brought this change] runtests: make 'oldlibssh' be before 0.9.4 - + The 'oldlibssh' feature indicates that the error code returned by libssh for a broken known_hosts file should be 67 rather than 60 (test1459). This feature was added as part of #8444 with 'oldlibssh' mapping to libssh versions prior to 0.9.6, and then refined as part of #8511 to map to versions prior to 0.9.5. - + In Red Hat Enterprise Linux 8.5 there is a patched version of libssh version 0.9.4 (https://git.centos.org/rpms/libssh/blob/c8/f/SOURCES) in which test1459 fails because it returns the "new" value rather than the "old" one. It's plausible that one of the patches is responsible for this rather than the underlying code but I don't think so. - + This change therefore drops the 'oldlibssh' version check to map to libssh versions older than 0.9.4, which fixes builds on RHEL-8. - + Closes #8548 - ipv4/6.d: clarify that they are about using IP addresses - + ... they may still *resolve* other families, but not use those addresses. - + Ref: #8530 Closes #8543 - [r-a-sattarov brought this change] curl/system.h: update ifdef condition for MCST-LCC compiler - + in mcst-lcc compiler => 1.25 added a new macro definition to determine compiler - + Closes #8546 Marc Hoersken (6 Mar 2022) - CI: install Python package impacket to run SMB test 1451 - + Install Python package impacket in relevant CI workflows. - + Follow up to #7935 Supersedes #7940 Closes #8544 @@ -1850,20 +3572,20 @@ Daniel Stenberg (5 Mar 2022) - [Michał Antoniak brought this change] connect: use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined - + Closes #8539 - docs/HYPER.md: updated to reflect current hyper build needs - GHA: build hyper with nightly rustc - + Closes #8545 Version 7.82.0 (5 Mar 2022) Daniel Stenberg (5 Mar 2022) - RELEASE-NOTES: synced - + The 7.82.0 release - THANKS: updates from the 7.82.0 release notes @@ -1872,48 +3594,48 @@ Daniel Stenberg (5 Mar 2022) Jay Satiro (5 Mar 2022) - unit1610: init SSL library before calling SHA256 functions - + The SSL library must be initialized (via global initialization) because libcurl's SHA256 functions may call SHA256 functions in the SSL library. - + Reported-by: Gisle Vanem - + Fixes https://github.com/curl/curl/issues/8538 Closes https://github.com/curl/curl/pull/8540 - examples/curlx: support building with OpenSSL 1.1.0+ - + - Access members of X509_STORE_CTX in OpenSSL 1.1.0+ by using API functions. - + The X509_STORE_CTX struct has been opaque since OpenSSL 1.1.0. - + Ref: https://curl.se/mail/lib-2022-03/0004.html - + Closes https://github.com/curl/curl/pull/8529 - h2h3: fix typo - + Bug: https://github.com/curl/curl/issues/8381#issuecomment-1055440241 Reported-by: Michael Kaufmann - [Farzin brought this change] CURLOPT_XFERINFOFUNCTION.3: fix example struct assignment - + Closes https://github.com/curl/curl/pull/8519 Daniel Stenberg (26 Feb 2022) - azure-pipelines: add a build on Windows with libssh - + Closes #8511 - runtests: make 'oldlibssh' be before 0.9.5 - + Closes #8511 - libssh: fix include files and defines use for Windows builds - + Reported-by: 梦终无痕 Bug: https://curl.se/mail/lib-2022-02/0131.html Closes #8511 @@ -1923,48 +3645,48 @@ Daniel Stenberg (26 Feb 2022) - [illusory-dream brought this change] winbuild: add parameter WITH_SSH - + For building with libssh Closes #8514 - configure: change output for cross-compiled alt-svc support - + It said 'no', while it actually is 'yes' - + Closes #8512 - gha: add a macOS CI job with libssh - + Closes #8513 - TODO: remove "Bring back libssh tests on Travis" - + The job was added to Circle CI in d8ddd0e7536 - TODO: remove "better persistency for HTTP/1.0" - + Let's not bother. - TODO: remove "Option to ignore private IP" - + ... as curl ignores the IP entirely by default these days. - TODO: remove "hardcode the "localhost" addresses" - + This is implmented since 1a0ebf6632f88 - TODO: 1.24 was a dupe of 1.1 - TODO: remove "Typesafe curl_easy_setopt()" - + I don't consider this a serious TODO item - KNOWN_BUGS: remove "Uploading HTTP/3 files gets interrupted" - + This works now - KNOWN_BUGS: remove "HTTP/3 multipart POST with quiche fails" - + It works now - quiche: remove two leftover debug infof() outputs @@ -1972,7 +3694,7 @@ Daniel Stenberg (26 Feb 2022) - [Tatsuhiro Tsujikawa brought this change] ngtcp2: Reset dynbuf when it is fully drained - + Reported-by: vl409 on github Fixes #7351 Closes #8504 @@ -1980,30 +3702,30 @@ Daniel Stenberg (26 Feb 2022) - [Stewart Gebbie brought this change] hostip: avoid unused parameter error in Curl_resolv_check - + When built without DNS-over-HTTP and without asynchronous resolvers, neither the dns nor the data parameters are used. - + That is Curl_resolv_check appears to call Curl_resolver_is_resolved(data, dns). But, with CURL_DISABLE_DOH without CURLRES_ASYNCH, the call is actually elided via a macro definition. - + This fix resolves the resultant: "unused parameter 'data'" error. - + Closes #8505 - http2: move two infof calls to debug-h2-only - + and remove a superflous one - + Ref: https://github.com/curl/curl/discussions/8498 Closes #8502 - [Jean-Philippe Menil brought this change] quiche: fix upload for bigger content-length - + Signed-off-by: Jean-Philippe Menil <jpmenil@gmail.com> Closes #8421 @@ -2011,39 +3733,39 @@ Jay Satiro (23 Feb 2022) - [Farzin brought this change] CURLOPT_PROGRESSFUNCTION.3: fix example struct assignment - + Closes https://github.com/curl/curl/pull/8500 Daniel Stenberg (22 Feb 2022) - [Rob Boeckermann brought this change] OS400/README: clarify compilation steps - + Closes #8494 - [Rob Boeckermann brought this change] OS400: fix typos in rpg include file - + This resolves issues compiling rpg code that includes the curl header file. - + Closes #8494 - [Michał Antoniak brought this change] vtls: fix socket check conditions - + fix condition to check the second socket during associate and disassociate connection - + Closes #8493 - libssh2: don't typecast socket to int for libssh2_session_handshake - + Since libssh2_socket_t uses SOCKET on windows which can be larger than int. - + Closes #8492 - RELEASE-NOTES: fix typo and make one desc shorter @@ -2051,51 +3773,51 @@ Daniel Stenberg (22 Feb 2022) - RELEASE-NOTES: synced - CURLOPT_XFERINFOFUNCTION.3: fix typo in example - + Reported-by: coralw on github Fixes #8487 Closes #8488 - README: disable linkchecks for the sponsor links - + Closes #8489 Jay Satiro (21 Feb 2022) - openssl: check if sessionid flag is enabled before retrieving session - + Ideally, Curl_ssl_getsessionid should not be called unless sessionid caching is enabled. There is a debug assertion in the function to help ensure that. Therefore, the pattern in all vtls is basically: - + if(primary.sessionid) {lock(); Curl_ssl_getsessionid(...); unlock();} - + There was one instance in openssl.c where sessionid was not checked beforehand and this change fixes that. - + Prior to this change an assertion would occur in openssl debug builds during connection stage if session caching was disabled. - + Reported-by: Jim Beveridge - + Fixes https://github.com/curl/curl/issues/8472 Closes https://github.com/curl/curl/pull/8484 - multi: allow user callbacks to call curl_multi_assign - + Several years ago a change was made to block user callbacks from calling back into the API when not supported (recursive calls). One of the calls blocked was curl_multi_assign. Recently the blocking was extended to the multi interface API, however curl_multi_assign may need to be called from within those user callbacks (eg CURLMOPT_SOCKETFUNCTION). - + I can't think of any callback where it would be unsafe to call curl_multi_assign so I removed the restriction entirely. - + Reported-by: Michael Wallner - + Ref: https://github.com/curl/curl/commit/b46cfbc Ref: https://github.com/curl/curl/commit/340bb19 - + Fixes https://github.com/curl/curl/issues/8480 Closes https://github.com/curl/curl/pull/8483 @@ -2103,108 +3825,108 @@ Daniel Stenberg (21 Feb 2022) - [Michał Antoniak brought this change] ssl: reduce allocated space for ssl backend when FTP is disabled - + Add assert() for the backend pointer in many places - + Closes #8471 - [Michał Antoniak brought this change] checkprefix: remove strlen calls - + Closes #8481 Jay Satiro (20 Feb 2022) - [1337vt brought this change] curl.h: fix typo - + Closes https://github.com/curl/curl/pull/8482 - [Jan Venekamp brought this change] sectransp: mark a 3DES cipher as weak - + - Change TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA strength to weak. - + All other 3DES ciphers are already marked as weak. - + Closes https://github.com/curl/curl/pull/8479 - [Jan Venekamp brought this change] bearssl: fix EXC_BAD_ACCESS on incomplete CA cert - + - Do not create trust anchor object for a CA certificate until after it is processed. - + Prior to this change the object was created at state BR_PEM_BEGIN_OBJ (certificate processing begin state). An incomplete certificate (for example missing a newline at the end) never reaches BR_PEM_END_OBJ (certificate processing end state) and therefore the trust anchor data was not set in those objects, which caused EXC_BAD_ACCESS. - + Ref: https://github.com/curl/curl/pull/8106 - + Closes https://github.com/curl/curl/pull/8476 - [Jan Venekamp brought this change] bearssl: fix connect error on expired cert and no verify - + - When peer verification is disabled use the x509_decode engine instead of the x509_minimal engine to parse and extract the public key from the first cert of the chain. - + Prior to this change in such a case no key was extracted and that caused CURLE_SSL_CONNECT_ERROR. The x509_minimal engine will stop parsing if any validity check fails but the x509_decode won't. - + Ref: https://github.com/curl/curl/pull/8106 - + Closes https://github.com/curl/curl/pull/8475 - [Jan Venekamp brought this change] bearssl: fix session resumption (session id) - + Prior to this change br_ssl_client_reset was mistakenly called with resume_session param set to 0, which disabled session resumption. - + Ref: https://github.com/curl/curl/pull/8106 - + Closes https://github.com/curl/curl/pull/8474 Daniel Stenberg (18 Feb 2022) - [Michał Antoniak brought this change] openssl: fix build for version < 1.1.0 - + Closes #8470 - [Joel Depooter brought this change] schannel: move the algIds array out of schannel.h - + This array is only used by the SCHANNEL_CRED struct in the schannel_acquire_credential_handle function. It can therefore be kept as a local variable. This is a minor update to bbb71507b7bab52002f9b1e0880bed6a32834511. - + This change also updates the NUM_CIPHERS value to accurately count the number of ciphers options listed in schannel.c, which is 47 instead of 45. It is unlikely that anyone tries to set all 47 values, but if they had tried, the last two would not have been set. - + Closes #8469 - [Alejandro R. Sedeño brought this change] configure.ac: use user-specified gssapi dir when using pkg-config - + Using the system pkg-config path in the face of a user-specified library path is asking to link the wrong library. - + Reported-by: Michael Kaufmann Fixes #8289 Closes #8456 @@ -2212,111 +3934,111 @@ Daniel Stenberg (18 Feb 2022) - [Kevin Adler brought this change] os400: Add link to QADRT devkit to README.OS400 - + Closes #8455 - [Kevin Adler brought this change] os400: Add function wrapper for system command - + The wrapper will exit if the system command failed instead of blindly continuing on. - + In addition, only copy docs which exist, since now the copy failure will cause the build to stop. - + Closes #8455 - [Kevin Adler brought this change] os400: Default build to target current release - + V6R1M0 is not available as a target release since IBM i 7.2. To keep from having to keep this up to date in git, default to the current release. Users can configure this to whatever release they want to actually build for. - + Closes #8455 - docs/INTERNALS.md: clean up, refer to the book - + The explanatory parts are now in the everything curl book (which can also use images etc). This document now refers to that resource and only leaves listings of supported versions of libs, tools and operating systems. See https://everything.curl.dev/internals - + Closes #8467 Marcel Raad (17 Feb 2022) - des: fix compile break for OpenSSL without DES - + When `USE_OPENSSL` was defined but OpenSSL had no DES support and a different crypto library was used for that, `Curl_des_set_odd_parity` was called but not defined. This could for example happen on Windows and macOS when using OpenSSL v3 with deprecated features disabled. - + Use the same condition for the function definition as used at the caller side, but leaving out the OpenSSL part to avoid including OpenSSL headers. - + Closes https://github.com/curl/curl/pull/8459 Daniel Stenberg (17 Feb 2022) - RELEASE-NOTES: synced - docs/DEPRECATE: remove NPN support in August 2022 - + Closes #8458 - ftp: provide error message for control bytes in path - + Closes #8460 - http: fix "unused parameter ‘conn’" warning - + Follow-up from 7d600ad1c395 - + Spotted on appveyor - + Closes #8465 Jay Satiro (17 Feb 2022) - [Alejandro R. Sedeño brought this change] sha256: Fix minimum OpenSSL version - + - Change the minimum OpenSSL version for using their SHA256 implementation from 0.9.7 to 0.9.8. - + EVP_sha256() does not appear in the OpenSSL source before 0.9.7h, and does not get built by default until 0.9.8, so trying to use it for all 0.9.7 is wrong, and before 0.9.8 is unreliable. - + Closes https://github.com/curl/curl/pull/8464 Daniel Stenberg (16 Feb 2022) - KNOWN_BUGS: remove "slow connect to localhost on Windows" - + localhost is not resolved anymore since 1a0ebf6632f88 - KNOWN_BUGS: remove "HTTP/3 download is 5x times slower than HTTP/2" - + It's not actually a bug. More like room for improvement. - KNOWN_BUGS: remove "HTTP/3 download with quiche halts after a while" - + Follow-up to 96f85a0fef694 - KNOWN_BUGS: remove "pulseUI vpn" as a problem - + We haven't heard about this for a long time and rumours have it they might have fixed it. - urldata: remove conn->bits.user_passwd - + The authentication status should be told by the transfer and not the connection. - + Reported-by: John H. Ayad Fixes #8449 Closes #8451 @@ -2324,109 +4046,109 @@ Daniel Stenberg (16 Feb 2022) - [Kevin Adler brought this change] gskit: Convert to using Curl_poll - + As mentioned in 32766cb, gskit was the last user of Curl_select which is now gone. Convert to using Curl_poll to allow build to work on IBM i. - + Closes #8454 - [Kevin Adler brought this change] gskit: Fix initialization of Curl_ssl_gskit struct - + In c30bf22, Curl_ssl_getsock was factored out in to a member of struct Curl_ssl but the gskit initialization was not updated to reflect this new member. - + Closes #8454 - [Kevin Adler brought this change] gskit: Fix errors from Curl_strerror refactor - + 2f0bb864c1 replaced sterror with Curl_strerror, but the strerror buffer shadows the set_buffer "buffer" parameter. To keep consistency with the other functions that use Curl_strerror, rename the parameter. - + In addition, strerror.h is needed for the definition of STRERROR_LEN. - + Closes #8454 Marcel Raad (15 Feb 2022) - ntlm: remove unused feature defines - + They're not used anymore and always supported. - + Closes https://github.com/curl/curl/pull/8453 Daniel Stenberg (15 Feb 2022) - [Kantanat Wannapaka brought this change] README.md: fix link and layout - + replace <a></a> tags and <img></img> tags - + Closes #8448 - KNOWN_BUGS: fix typo "libpsl" Jay Satiro (14 Feb 2022) - h2h3: fix compiler warning due to function prototype mismatch - + - Add missing const qualifier in Curl_pseudo_headers declaration. Daniel Stenberg (14 Feb 2022) - [Stefan Eissing brought this change] urlapi: handle "redirects" smarter - + - avoid one malloc when setting a new url via curl_url_set() and CURLUPART_URL. - extract common pattern into a new static function. - + Closes #8450 - cijobs: pick up circleci configure lines better - circleci: add a job using wolfSSH - + Build only, no tests. - + Closes #8445 - scripts/ciconfig.pl: show used options not available - circleci: add a job using libssh - + Closes #8444 - runtests: set 'oldlibssh' for libssh versions before 0.9.6 - + ... and make test 1459 check for the different return code then. - + Closes #8444 Jay Satiro (13 Feb 2022) - Makefile.am: Generate VS 2022 projects - + Follow-up to f13d4d0 which added VS 2022 project support. - + Ref: https://github.com/curl/curl/pull/8438 - [Daniel Stenberg brought this change] projects: remove support for MSVC before VC10 (Visual Studio 2010) - + - Remove Visual Studio project files for VC6, VC7, VC7.1, VC8 and VC9. - + Those versions are too old to be maintained any longer. - + Closes https://github.com/curl/curl/pull/8442 - [Stav Nir brought this change] projects: add support for Visual Studio 17 (2022) - + Closes https://github.com/curl/curl/pull/8438 Daniel Stenberg (13 Feb 2022) @@ -2437,145 +4159,145 @@ Daniel Stenberg (13 Feb 2022) - [Michał Antoniak brought this change] misc: remove unused data when IPv6 is not supported - + Closes #8430 - scripts/ciconfig: show CI job config info - + Closes #8446 - quiche: handle stream reset - + A stream reset now causes a CURLE_PARTIAL_FILE error. I'm not convinced this is the right action nor the right error code. - + Reported-by: Lucas Pardue Fixes #8437 Closes #8440 - mime: use a define instead of the magic number 24 - + MIME_BOUNDARY_DASHES is now the number of leading dashes in the generated boundary string. - + Closes #8441 - [Henrik Holst brought this change] hostcheck: reduce strlen calls on chained certificates - + Closes #8428 - [Patrick Monnerat brought this change] mime: some more strlen() call removals. - + Closes #8423 - scripts/cijobs.pl: detect zuul cmake jobs better - url: exclude zonefrom_url when no ipv6 is available - + Closes #8439 - if2ip: make Curl_ipv6_scope a blank macro when IPv6-disabled - + Closes #8439 - [Henrik Holst brought this change] mprintf: remove strlen calls on empty strings in dprintf_formatf - + Turns out that in dprintf_formatf we did a strlen on empty strings, a bit strange is how common this actually is, 24 alone when doing a simple GET from https://curl.se - + Closes #8427 - wolfssl: return CURLE_AGAIN for the SSL_ERROR_NONE case - + Closes #8431 - wolfssl: when SSL_read() returns zero, check the error - + Returning zero indicates end of connection, so if there's no data read but the connection is alive, it needs to return -1 with CURLE_AGAIN. - + Closes #8431 - quiche: after leaving h3_recving state, poll again - + This could otherwise easily leave libcurl "hanging" after the entire transfer is done but without noticing the end-of-transfer signal. - + Assisted-by: Lucas Pardue Closes #8436 - quiche: when *recv_body() returns data, drain it before polling again - + Assisted-by: Lucas Pardue - + Closes #8429 - [gaoxingwang on github brought this change] configure: fix '--enable-code-coverage' typo - + Fixes #8425 Closes #8426 - lib/h2h3: #ifdef on ENABLE_QUIC, not the wrong define - + Otherwise the build fails when H3 is enabled but the build doesn't include nghttp2. - + Closes #8424 - hostcheck: pass in pattern length too, to avoid a strlen call - + Removes one strlen() call per SAN name in a cert-check. - + Closes #8418 - [Henrik Holst brought this change] misc: remove strlen for Curl_checkheaders + Curl_checkProxyheaders - + Closes #8409 - configure: requires --with-nss-deprecated to build with NSS - + Add deprecation plans to docs/DEPRECATE.md - + Closes #8395 - mqtt: free 'sendleftovers' in disconnect - + Fix a memory-leak - + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43646 Closes #8415 - [Patrick Monnerat brought this change] openldap: pass string length arguments to client_write() - + This uses the new STRCONST() macro and saves 2 strlen() calls on short string constants per LDIF output line. - + Closes #8404 - [Henrik Holst brought this change] misc: reduce strlen() calls with Curl_dyn_add() - + Use STRCONST() to switch from Curl_dyn_add() to Curl_dyn_addn() for string literals. - + Closes #8398 - http2: fix the array copy to nghttp2_nv - + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44517 Follow-up to 9f985a11e794 Closes #8414 @@ -2583,85 +4305,85 @@ Daniel Stenberg (13 Feb 2022) - RELEASE-NOTES: synced - scripts/cijobs.pl: output data about all currect CI jobs - + This script parses the config files for all the CI services currently in use and output the information in a uniform way. The idea is that the output from this script should be possible to massage into informational tables or graphs to help us visualize what they are all testing and NOT testing. - + Closes #8408 - maketgz: return error if 'make dist' fails - + To better detect this problem in CI jobs - + Reported-by: Marcel Raad Bug: https://curl.se/mail/lib-2022-02/0070.html Closes #8402 - h2h3: pass correct argument types to infof() - + Detected by Coverity. CID 1497993 - + Closes #8401 - lib/Makefile: remove config-tpf.h from the dist - + Follow-up from da15443dddea2bfb. Missed before because the 'distcheck' CI job was not working as intended. - + Reported-by: Marcel Raad Bug: https://curl.se/mail/lib-2022-02/0070.html Closes #8403 - configure: remove support for "embedded ares" - + In March 2010 (commit 4259d2df7dd) we removed the embedded 'ares' directory from the curl source tree but we have since supported especially detecting and using that build directory. The time has come to remove that kludge and ask users to specify the c-ares dir correctly with --enable-ares. - + Closes #8397 - [Sebastian Sterk brought this change] github/workflows/mbedtls: fix indent & remove unnecessary line breaks - + Closes #8399 - CI: move the NSS job from zuul to GHA - + Closes #8396 - tests/unit/Makefile.am: add NSS_LIBS to build with NSS fine - + Closes #8396 Marcel Raad (7 Feb 2022) - curl-openssl: fix SRP check for OpenSSL 3.0 - + When OpenSSL 3.0 is built with `--api=3.0` and `no-deprecated`, the SRP functions exist in the library, but are disabled for user code. Check if they are actually usable instead of only if they exist. Also, check for the functions actually required for TLS-SRP. - + TLS-SRP support is still enabled if OpenSSL is configured with just `--api=3.0` or with `--api=1.1.1 no-deprecated`. - + Closes https://github.com/curl/curl/pull/8394 Daniel Stenberg (7 Feb 2022) - [Henrik Holst brought this change] http: make Curl_compareheader() take string length arguments too - + Also add STRCONST, a macro that returns a string literal and it's length for functions that take "string,len" - + Removes unnecesary calls to strlen(). - + Closes #8391 - vquic/vquic.h: removed the unused H3 psuedo defines @@ -2673,132 +4395,132 @@ Daniel Stenberg (7 Feb 2022) - http2: use Curl_pseudo_headers - h2h3: added Curl_pseudo_headers() - + For use with both http2 and http3 requests. - ngtcp2/quiche: make :scheme possible to set - http2: allow CURLOPT_HTTPHEADER change ":scheme" - + The only h2 psuedo header that wasn't previously possible to change by a user. This change also makes it impossible to send a HTTP/1 header that starts with a colon, which I don't think anyone does anyway. - + The other pseudo headers are possible to change indirectly by doing the rightly crafted request. - + Reported-by: siddharthchhabrap on github Fixes #8381 Closes #8393 - h2/h3: provide and refer to pseudo headers as defines - + ... and do sizeof() on the defines to use constants better. - + Closes #8389 - [Michał Antoniak brought this change] smb: passing a socket for writing and reading data instead of FIRSTSOCKET - + Closes #8383 - x509asn1: toggle off functions not needed for diff tls backends - + ... and clean the header file from private defines/structs (move to C file) and unused function prototypes. - + Closes #8386 - lib: move hostcheck and x509sn1 sources to vtls/ - + ... since they are used strictly by TLS code. - + Closes #8386 Marcel Raad (4 Feb 2022) - version_win32: fix warning for `CURL_WINDOWS_APP` - + The build version is not supported by the UWP code. - + Closes https://github.com/curl/curl/pull/8385 Daniel Stenberg (4 Feb 2022) - tests/disable-scan.pl: properly detect multiple symbols per line - + Test 1165 would fail on some systems because it didn't detect CURL_DISABLE_* symbols that were used to the right of another one on the same line! The script would only detect and extract the first one. - + Reported-by: Marcel Raad Fixes #8384 Closes #8388 Jay Satiro (4 Feb 2022) - config.d: Clarify _curlrc filename is still valid on Windows - + Recent changes added support for filename .curlrc on Windows, and when it's not found curl falls back on the original Windows filename _curlrc. _curlrc was removed from the doc, however it is still valid. - + Closes https://github.com/curl/curl/pull/8382 Daniel Stenberg (4 Feb 2022) - lib: remove support for CURL_DOES_CONVERSIONS - + TPF was the only user and support for that was dropped. - + Closes #8378 - TPF: drop support - + There has been no TPF related changes done since September 2010 (commit 7e1a45e224e57) and since this is a platform that is relatively different than many others (== needs attention), I draw the conclusion that this build is broken since a long time. - + Closes #8378 - scripts/delta: check the file delta for current branch - + ... also polish the output style a little bit Jay Satiro (3 Feb 2022) - [Fabian Keil brought this change] runtests.pl: tolerate test directories without Makefile.inc - + Silences the following warnings when using a Makefile.inc-free TESTDIR using the "-o" argument: - + readline() on closed filehandle D at ./runtests.pl line 592. Use of uninitialized value $disttests in pattern match (m//) at ./runtests.pl line 3602. - + Closes https://github.com/curl/curl/pull/8379 Daniel Stenberg (3 Feb 2022) - [Henrik Holst brought this change] setopt: do bounds-check before strdup - + Curl_setstropt() allocated memory for the string before checking if the string was within bounds. The bounds check should be done first. - + Closes #8377 - [Michał Antoniak brought this change] mbedtls: enable use of mbedtls without filesystem functions support - + Closes #8376 - [Bernhard Walle brought this change] configure: support specification of a nghttp2 library path - + This enables using --with-nghttp2=<dir> on systems without pkg-config. - + Closes #8375 - scripts/release-notes.pl: remove leftover debug output @@ -2810,18 +4532,18 @@ Daniel Stenberg (3 Feb 2022) - [Leah Neukirchen brought this change] scripts/completion.pl: improve zsh completion - + - Detect all spellings of <file>, <file name> etc as well as <path>. - Only complete directories for <dir>. - Complete URLs for <URL>. - Complete --request and --ftp-method. - + Closes #8363 - [Davide Cassioli brought this change] configure: use correct CFLAGS for threaded resolver with xlC on AIX - + Fixes #8276 Closes #8374 @@ -2829,108 +4551,108 @@ Daniel Stenberg (3 Feb 2022) Jay Satiro (2 Feb 2022) - build: fix ngtcp2 crypto library detection - + - Change library link check for ngtcp2_crypto_{gnutls,openssl} to to use function ngtcp2_crypto_recv_client_initial_cb instead of ngtcp2_crypto_ctx_initial. - + The latter function is no longer external since two days ago in ngtcp2/ngtcp2@533451f. curl HTTP/3 CI builds have been failing since then because they would not link to the ngtcp2 crypto library. - + Ref: https://github.com/ngtcp2/ngtcp2/pull/356 - + Closes https://github.com/curl/curl/pull/8372 - [Henrik Holst brought this change] urlapi: remove an unnecessary call to strlen - + - Use strcpy instead of strlen+memcpy to copy the url path. - + Ref: https://curl.se/mail/lib-2022-02/0006.html - + Closes https://github.com/curl/curl/pull/8370 Daniel Stenberg (1 Feb 2022) - scripts/copyright.pl: fix for handling removed files better - vxworks: drop support - + No changes or fixes in vxworks related code since 2009 leads me to believe that this doesn't work anymore. - + Closes #8362 - [Henrik Holst brought this change] base64: remove an unnecessary call to strlen - + Closes #8369 - tool_getparam: initial --json support - + Adds these test cases: - + 383 - simple single command line option 384 - reading it from stdin 385 - getting two --json options on command line 386 - --next works after --json - + Closes #8314 - [Bjarni Ingi Gislason brought this change] curl_getdate.3: remove pointless .PP line - + mandoc: WARNING: skipping paragraph macro: PP empty - + Reported-by: Samuel Henrique Closes #8365 - [Sebastian Sterk brought this change] multi: grammar fix in comment - + After 'must', the verb is used without 'to'. Correct: "must" or "have to" - + Closes #8368 - openldap: fix compiler warning when built without SSL support - + openldap.c:841:52: error: unused parameter ‘data’ [-Werror=unused-parameter] - + Closes #8367 - [Samuel Henrique brought this change] CURLSHOPT_LOCKFUNC.3: fix typo "relased" -> "released" - + Found when packaging 7.81.0 for Debian. - + Closes #8364 - netware: remove support - + There are no current users and no Netware related changes done in the code for over 13 years is a clear sign this is abandoned. - + Closes #8358 - CI: move two jobs from Zuul to Circle CI - + - openssl-no-verbose - openssl-no-proxy - + Closes #8359 - cirlceci: also run a c-ares job on arm with debug enabled - + Closes #8357 - ci: move the OpenSSL + c-ares job from Zuul to Circle CI - + Closes #8357 - mailmap: Jan-Piet Mens @@ -2938,11 +4660,11 @@ Daniel Stenberg (1 Feb 2022) - [luminixinc on github brought this change] multi: remember connection_id before returning connection to pool - + Fix a bug that does not require a new CVE as discussed on hackerone.com. Previously `connection_id` was accessed after returning connection to the shared pool. - + Bug: https://hackerone.com/reports/1463013 Closes #8355 @@ -2952,7 +4674,7 @@ Jay Satiro (31 Jan 2022) - [Jan-Piet Mens brought this change] docs: capitalize the name 'Netscape' - + Closes https://github.com/curl/curl/pull/8354 Daniel Stenberg (30 Jan 2022) @@ -2961,26 +4683,26 @@ Daniel Stenberg (30 Jan 2022) - [Antoine Pietri brought this change] docs: grammar proofread, typo fixes - + (Partially automated) proofread of most of the documentation, leading to various typo fixes. - + Closes #8353 - urldata: CONN_IS_PROXIED replaces bits.close when proxy can be disabled - + To remove run-time checks for such builds. - + Closes #8350 - setopt: fix the TLSAUTH #ifdefs for proxy-disabled builds - + Closes #8350 - conncache: make conncache_add_bundle return the pointer - + Simplifies the logic a little and avoids a ternary operator. - + Ref: #8346 Closes #8349 @@ -2990,16 +4712,16 @@ Jay Satiro (30 Jan 2022) - [neutric on github brought this change] docs/TheArtOfHttpScripting: fix example POST URL - + Closes https://github.com/curl/curl/pull/8352 Daniel Stenberg (28 Jan 2022) - nss: handshake callback during shutdown has no conn->bundle - + The callback gets called because of the call to PR_Recv() done to attempt to avoid RST on the TCP connection. The conn->bundle pointer is already cleared at this point so avoid dereferencing it. - + Reported-by: Eric Musser Fixes #8341 Closes #8342 @@ -3007,100 +4729,100 @@ Daniel Stenberg (28 Jan 2022) - [Michał Antoniak brought this change] mbedtls: remove #include <mbedtls/certs.h> - + mbedtls/certs.h file contains only certificates example (all definitions is beginning by mbedtls_test_*). None of them is used so we can avoid include the file. - + Closes #8343 - [Michał Antoniak brought this change] mbedtls: enable use of mbedtls without CRL support - + Closes #8344 - [Bernhard Walle brought this change] configure: set CURL_LIBRARY_PATH for nghttp2 - + To execute the test program, we might need the library path so that the lib is found at runtime. - + Closes #8340 Jay Satiro (28 Jan 2022) - schannel: restore debug message in schannel_connect_step2 - + This is a follow-up to recent commit 2218c3a which removed the debug message to avoid an unused variable warning. The message has been reworked to avoid the warning. - + Ref: https://github.com/curl/curl/pull/8320#issuecomment-1022957904 - + Closes https://github.com/curl/curl/pull/8336 - test3021: disable all msys2 path transformation - + - Disable all MSYS2 path transformation in test3021 and test3022. - + Prior to this change path transformation in those tests was disabled only for arguments that start with forward slashes. However arguments that are in base64 contain forward slashes at any position and caused unwanted translations. - + == Info: Denied establishing ssh session: mismatch sha256 fingerprint. Remote +/EYG2YDzDGm6yiwepEMSuExgRRMoTi8Di1UN3kixZw= is not equal to +C:/msys64/EYG2YDzDGm6yiwepEMSuExgRRMoTi8Di1UN3kixZw - + In the above example an argument containing a base64 sha256 fingerprint was passed to curl after MSYS2 translated +/ into +C:/msys64/, and then the fingerprint didn't match what was expected. - + Ref: https://www.msys2.org/wiki/Porting/ - + Fixes https://github.com/curl/curl/issues/8084 Closes https://github.com/curl/curl/pull/8325 Daniel Stenberg (27 Jan 2022) - CI: move scan-build job from Zuul to Azure Pipelines - + Closes #8338 Marcel Raad (27 Jan 2022) - openssl: fix `ctx_option_t` for OpenSSL v3+ - + The options have been changed to `uint64_t` in https://github.com/openssl/openssl/commit/56bd17830f2d5855b533d923d4e0649d3ed61d11. - + Closes https://github.com/curl/curl/pull/8331 Daniel Stenberg (27 Jan 2022) - CI: move 'distcheck' job from zuul to azure pipelines - + Assisted-by: Kushal Das - + Closes #8334 - vtls: pass on the right SNI name - + The TLS backends convert the host name to SNI name and need to use that. This involves cutting off any trailing dot and lowercasing. - + Co-authored-by: Jay Satiro Closes #8320 - url: revert the removal of trailing dot from host name - + Reverts 5de8d84098db1bd24e (May 2014, shipped in 7.37.0) and the follow-up changes done afterward. - + Keep the dot in names for everything except the SNI to make curl behave more similar to current browsers. This means 'name' and 'name.' send the same SNI for different 'Host:' headers. - + Updated test 1322 accordingly - + Fixes #8290 Reported-by: Charles Cazabon Closes #8320 @@ -3108,15 +4830,15 @@ Daniel Stenberg (27 Jan 2022) - [neutric on github brought this change] docs/TheArtOfHttpScripting: fix capitalization - + Closes #8333 - tests/memanalyze.pl: also count and show "total allocations" - + This is the total number of bytes allocated, increasing for new allocations and never reduced when freed. The existing "Maximum allocated" is the high water mark. - + Closes #8330 - mailmap: spellfix githuh => github @@ -3124,160 +4846,160 @@ Daniel Stenberg (27 Jan 2022) - RELEASE-NOTES: synced - hostcheck: fixed to not touch used input strings - + Avoids the need to clone the strings before check, thus avoiding mallocs, which for cases where there are many SAN names in a cert could end up numerous. - + Closes #8321 - ngtcp2: adapt to changed end of headers callback proto - + Closes #8322 - [Xiaoke Wang brought this change] openssl: check SSL_get_ex_data to prevent potential NULL dereference - + Closes #8268 Jay Satiro (23 Jan 2022) - md5: check md5_init_func return value - + Prior to this change the md5_init_func (my_md5_init) return value was ignored. - + Closes https://github.com/curl/curl/pull/8319 - md5: refactor for standard compliance - + - Wrap OpenSSL / wolfSSL MD5 functions instead of taking their function addresses during static initialization. - + Depending on how curl was built the old way may have used a dllimport function address during static initialization, which is not standard compliant, resulting in Visual Studio warning C4232 (nonstandard extension). Instead the function pointers now point to the wrappers which call the MD5 functions. - + This change only affects OpenSSL and wolfSSL because calls to other SSL libraries' md5 functions were already wrapped. Also sha256.c already does this for all SSL libraries. - + Ref: https://github.com/curl/curl/pull/8298 - + Closes https://github.com/curl/curl/pull/8318 Daniel Stenberg (21 Jan 2022) - [Lucas Pardue brought this change] docs: update IETF links to use datatracker - + The tools.ietf.org domain has been deprecated a while now, with the links being redirected to datatracker.ietf.org. - + Rather than make people eat that redirect time, this change switches the URL to a more canonical source. - + Closes #8317 - [Harry Sarson brought this change] CI: test building wolfssl with --enable-opensslextra - + Closes #8315 - [Harry Sarson brought this change] misc: allow curl to build with wolfssl --enable-opensslextra - + put all #include of openssl files behind wolfssl ifdefs so that we can use the wolfssl/ prefixed include paths. Without these curl only builds when wolfssl is built with enable-all. - + Fixes #8292 Closes #8315 - [Lucas Pardue brought this change] quiche: change qlog file extension to `.sqlog` - + quiche has just switched it's qlog serialization format to JSON-SEQ by default . The spec says this SHOULD use `.sqlog` extension. - + I believe ngtcp2 also supports JSON-SEQ by default as of https://github.com/ngtcp2/ngtcp2/commit/9baf06fc3f352a1d062b6953ae1de22cae30639d - + Let's update curl so that tools know what format we are using! - + Closes #8316 Jay Satiro (21 Jan 2022) - projects: Fix Visual Studio wolfSSL configurations - + - Change build-wolfssl.bat to disable SSLv3, enable TLSv1.3, enable wolfSSL_DES_ecb_encrypt (needed by NTLM) and enable alt cert chains. - + - Disable warning C4214 'bit field types other than int'. - + - Add include directory wolfssl\wolfssl. - + wolfSSL offers OpenSSL API compatibility that libcurl uses, and some recent change in libcurl included an include file for wolfSSL like openssl/foo.h, which has a path like wolfssl\wolfssl\openssl\foo.h. - + The include directory issue was reported in #8292 but it's currently unclear whether this type of change is needed for other build systems. - + Bug: https://github.com/curl/curl/issues/8292 Reported-by: Harry Sarson - + Closes https://github.com/curl/curl/pull/8298 Daniel Stenberg (21 Jan 2022) - openssl: return error if TLS 1.3 is requested when not supported - + Previously curl would just silently ignore it if the necessary defines are not present at build-time. - + Reported-by: Stefan Eissing Fixes #8309 Closes #8310 - TODO: Passing NOTIFY option to CURLOPT_MAIL_RCPT - + Closes #8232 - [Philip H brought this change] workflows/wolfssl: install impacket - + needed Python Package for SMB tests - + Closes #8307 - url: make Curl_disconnect return void - + 1. The function would only ever return CURLE_OK anyway 2. Only one caller actually used the return code 3. Most callers did (void)Curl_disconnect() - + Closes #8303 - docs: document HTTP/2 not insisting on TLS 1.2 - + Both for --http2 and CURLOPT_HTTP_VERSION. - + Reported-by: jhoyla on github Fixes #8235 Closes #8300 - cmdline-opts/gen.pl: fix option matching to improve references - + Previously it could mistakenly match partial names when there are options that start with the same prefix, leading to the wrong references used. - + Closes #8299 - TODO: Less memory massaging with Schannel @@ -3285,26 +5007,26 @@ Daniel Stenberg (21 Jan 2022) - [Patrick Monnerat brought this change] runtests.pl: disable debuginfod - + Valgrind and gdb implement this feature: as this highly slows down tests, disable it. - + Closes #8291 - RELEASE-NOTES: synced - CURLMOPT_TIMERFUNCTION/DATA.3: fix the examples - + ... to not call libcurl recursively back. - + Closes #8286 - multi: set in_callback for multi interface callbacks - + This makes most libcurl functions return error if called from within a callback using the same multi handle. For example timer or socket callbacks calling curl_multi_socket_action. - + Reported-by: updatede on github Fixes #8282 Closes #8286 @@ -3312,37 +5034,37 @@ Daniel Stenberg (21 Jan 2022) - docs/HISTORY.md: mention alt-svc and HSTS - misc: remove the final watcom references - + Follow-up to bbf8cae44dedc495e6 - + We removed support for the watcom builds files back in September 2020. This removes all remaining watcom references and ifdefs. - + Closes #8287 - misc: remove BeOS code and references - + There has not been a mention of this OS in any commit since December 2004 (58f4af7973e3d2). The OS is also long gone. - + Closes #8288 - tool_getparam: DNS options that need c-ares now fail without it - + Just silently accepting the options and then not having any effect is not good. - + Ref: #8283 Closes #8285 - curl: remove "separators" (when using globbed URLs) - + Unless muted (with -s) When doing globbing, curl would output mime-like separators between the separate transfers. This is not documented anywhere, surprises users and clobbers the output. Gone now. - + Updated test 18 and 1235 - + Reported-by: jonny112 on github Bug: https://github.com/curl/curl/discussions/8257 Closes #8278 @@ -3351,118 +5073,118 @@ Jay Satiro (15 Jan 2022) - [Niels Martignène brought this change] mbedtls: fix CURLOPT_SSLCERT_BLOB (again) - + - Increase the buffer length passed to mbedtls_x509_crt_parse to account for the null byte appended to the temporary blob. - + Follow-up to 867ad1c which uses a null terminated copy of the certificate blob, because mbedtls_x509_crt_parse requires PEM data to be null terminated. - + Ref: https://github.com/curl/curl/commit/867ad1c#r63439893 Ref: https://github.com/curl/curl/pull/8146 - + Closes https://github.com/curl/curl/pull/8260 Daniel Stenberg (15 Jan 2022) - [Alessandro Ghedini brought this change] quiche: verify the server cert on connect - + Similarly to c148f0f551f9bea0e3d0, make quiche correctly acknowledge `CURLOPT_SSL_VERIFYPEER` and `CURLOPT_SSL_VERIFYHOST`. - + Fixes #8173 Closes #8275 - [Ikko Ashimine brought this change] checksrc: fix typo in comment - + enfore -> enforce - + Closes #8281 - curl-openssl: remove the OpenSSL headers and library versions check - + It is more work to maintain that check than the (any?) benefit it brings. - + Fixes #8279 Reported-by: Satadru Pramanik Closes #8280 - mqtt: free any leftover when done - + Oss-fuzz found an issue when the "sendleftovers" pointer could leak memory. Fix this by always freeing it (if still assigned) in the done function. - + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43515 Closes #8274 - formdata: avoid size_t => long typecast overflows - + Typically a problem for platforms with 32 bit long and 64 bit size_t - + Reported-by: Fabian Yamaguchi Bug: https://hackerone.com/reports/1444539 Closes #8272 - RELEASE-NOTES: synced - + bump next release to become 7.82.0 Marcel Raad (13 Jan 2022) - build: enable -Warith-conversion - + This makes the behavior consistent between GCC 10 and earlier versions. - + Closes https://github.com/curl/curl/pull/8271 - build: fix -Wenum-conversion handling - + Don't enable that warning when warnings are disabled. Also add it to CMake. - + Closes https://github.com/curl/curl/pull/8271 - appveyor: use VS 2017 image for the autotools builds - + The newer images don't have all required MSYS2 packages. - + Fixes https://github.com/curl/curl/issues/8248 Closes https://github.com/curl/curl/pull/8265 - appveyor: update images from VS 2019 to 2022 - + Closes https://github.com/curl/curl/pull/8265 Daniel Stenberg (12 Jan 2022) - [Michał Antoniak brought this change] mbedtls: return CURLcode result instead of a mbedtls error code - + ... when a certificate fails to be loaded from a blob - + Closes #8266 - curl_multi_socket.3: remove callback and typical usage descriptions - + 1. The callback is better described in the option for setting it. Having it in a single place reduces the risk that one of them is wrong. - + 2. The "typical usage" is wrong since the functions described in this man page are both deprecated so they cannot be used in any "typical" way anymore. - + Closes #8262 - curl-functions.m4: revert DYLD_LIBRARY_PATH tricks in CURL_RUN_IFELSE - + Mostly reverts ba0657c343f, but now instead just run the plain macro on darwin. The approach as used on other platforms is simply not necessary on macOS. - + Fixes #8229 Reported-by: Ryan Schmidt Closes #8247 @@ -3470,92 +5192,92 @@ Daniel Stenberg (12 Jan 2022) - [Patrick Monnerat brought this change] openldap: implement SASL authentication - + As credentials can be quite different depending on the mechanism used, there are no default mechanisms for LDAP and simple bind with a DN is then used. - + The caller has to provide mechanism(s) using CURLOPT_LOGIN_OPTIONS to enable SASL authentication and disable simple bind. - + Closes #8152 Jay Satiro (10 Jan 2022) - [Cameron Will brought this change] CURLOPT_RESOLVE.3: change example port to 443 - + 83cc966 changed documentation from using http to https. However, CURLOPT_RESOLVE being set to port 80 in the documentation means that it isn't valid for the new URL. Update to 443. - + Closes https://github.com/curl/curl/pull/8258 Daniel Stenberg (10 Jan 2022) - [Fabian Keil brought this change] test374: gif data without new line at the end - + Closes #8239 - [Fabian Keil brought this change] runtests.pl: support the nonewline attribute for the data part - + Added to FILEFORMAT - + Closes #8239 - [Patrick Monnerat brought this change] curl tool: erase some more sensitive command line arguments - + As the ps command may reveal sensitive command line info, obfuscate options --tlsuser, --tlspasswd, --proxy-tlsuser, --proxy-tlspassword and --oauth2-bearer arguments. - + Reported-by: Stephen Boost <s.booth@epcc.ed.ac.uk> - + Closes #7964 - mesalink: remove support - + Mesalink has ceased development. We can no longer encourage use of it. It seems to be continued under the name TabbySSL, but no attempts have (yet) been to make curl support it. - + Fixes #8188 Closes #8191 - ldap: return CURLE_URL_MALFORMAT for bad URL - + For consistency, use the same return code for URL malformats, independently of what scheme that is used. Previously this would return CURLE_LDAP_INVALID_URL, but starting now that error cannot be returned. - + Closes #8170 - docs/cmdline-opts: add "mutexed" options for more http versions - + Update four http version man page sections. - + Closes #8254 - [Stephen M. Coakley brought this change] rustls: add CURLOPT_CAINFO_BLOB support - + Add support for `CURLOPT_CAINFO_BLOB` `CURLOPT_PROXY_CAINFO_BLOB` to the rustls TLS backend. Multiple certificates in a single PEM string are supported just like OpenSSL does with this option. - + This is compatible at least with rustls-ffi 0.8+ which is our new minimum version anyway. - + I was able to build and run this on Windows, pulling trusted certs from the system and then add them to rustls by setting `CURLOPT_CAINFO_BLOB`. Handy! - + Closes #8255 - scripts/copyright.pl: ignore missing files @@ -3563,44 +5285,44 @@ Daniel Stenberg (10 Jan 2022) - RELEASE-NOTES: synced - data/DISABLED: disable test 313 for wolfssl builds - + It was previously disabled only in the CI jobs yaml - + Closes #8252 - runtests: make 'wolfssl' a testable feature - + Closes #8252 - GHA: install stunnel in the medbtls + wolfssl CI jobs - + Closes #8252 - CI: move the rustls CI job to GHA from Zuul - + Closes #8251 - DISABLE: disable a dozen tests in the rustls build - + Disables tests that don't yet work with the rustls backend. - + Fixes #8004 Closes #8250 - runtests: make 'rustls' a testable feature - remote-header-name.d: clarify - + - it strips off the path from the server provided name - it saves in current directory or --output-dir - + Ref: https://curl.se/mail/archive-2022-01/0032.html Closes #8249 - url: given a user in the URL, find pwd for that user in netrc - + Add test 380 and 381 to verify, edited test 133 - + Reported-by: Manfred Schwarb Fixes #8241 Closes #8243 @@ -3608,32 +5330,32 @@ Daniel Stenberg (10 Jan 2022) - [Niels Martignène brought this change] mbedtls: Fix ssl_init error with mbedTLS 3.1.0+ - + Since mbedTLS 3.1.0, mbedtls_ssl_setup() fails if the provided config struct is not valid. - + mbedtls_ssl_config_defaults() needs to be called before the config struct is passed to mbedtls_ssl_setup(). - + Closes #8238 - [Filip Lundgren brought this change] cmake: fix iOS CMake project generation error - + Closes #8244 - ngtcp2: fix declaration of ‘result’ shadows a previous local - + Follow-up to 8fbd6feddfa587cfd3 - + Closes #8245 - openssl.h: avoid including OpenSSL headers here - + ... by instead using the struct version of the typedef'ed pointer. To fix build errors when both Schannel and OpenSSL are enabled. - + Fixes #8240 Reported-by: Jan Ehrhardt Closes #8246 @@ -3641,24 +5363,24 @@ Daniel Stenberg (10 Jan 2022) - curl_url_set.3: mention when CURLU_ALLOW_SPACE was added - tool_findfile: free mem properly - + Follow-up to 764e4f066d5 - + Closes #8242 - tool_findfile: check ~/.config/curlrc too - + ... after the initial checks for .curlrc and if XDG_CONFIG_HOME is not set, use $HOME and $CURL_HOME to check if ~/.config/curlrc is present. - + Add test 436 to verify - + Reported-by: Sandro Jaeckel Fixes #8208 Closes #8213 - runtests: allow client/file to specify multiple directories - + ... and make sure to mkdir them all - scripts/copyright.pl: support many provided file names on the cmdline @@ -3686,7 +5408,7 @@ Daniel Stenberg (10 Jan 2022) - mailmap: Xiaoke Wang - openssl: copyright year update - + Follow-up to 30aea2b1ede - scripts/copyright.pl: hush unless -v (for verbose) is used @@ -3694,11 +5416,11 @@ Daniel Stenberg (10 Jan 2022) - [Xiaoke Wang brought this change] openssl: check the return value of BIO_new_mem_buf() - + Closes #8233 - examples/multi-app.c: call curl_multi_remove_handle as well - + Fixes #8234 Reported-by: Melroy van den Berg Closes #8236 @@ -3706,31 +5428,31 @@ Daniel Stenberg (10 Jan 2022) - COPYING: bump copyright year range - RELEASE-NOTES: synced - + and bump curlver after release - docs: fix mandoc -T lint formatting complaints - + Closes #8228 - next.d. remove .fi/.nf as they are handled by gen.pl - + Closes #8228 - gen.pl: terminate "example" sections better - + If the example (section that is prefixed with spaces) ends the description gen.pl would previously miss to output the terminating .fi - + Closes #8228 - [Satadru Pramanik brought this change] curl-functions.m4: fix LIBRARY_PATH adjustment to avoid eval - + $$ usage in a m4 file introduces the PID in linux. Instead, just duplicate previous working code with a case switch. - + Fixes #8229 Closes #8230 @@ -3738,7 +5460,7 @@ Version 7.81.0 (5 Jan 2022) Daniel Stenberg (5 Jan 2022) - RELEASE-NOTES: synced - + curl 7.81.0 release - THANKS: add names from 7.81.0 release @@ -3746,41 +5468,41 @@ Daniel Stenberg (5 Jan 2022) - curl_multi_init.3: fix the copyright year range - test719-721: require "proxy" feature present to run - + Bug: https://github.com/curl/curl/pull/8223#issuecomment-1005188696 Reported-by: Marc Hörsken - + Closes #8226 - test719: require ipv6 support to run - + Follow-up to effd2bd7ba2a5fd244 Reported-by: Marc Hörsken Bug: https://github.com/curl/curl/pull/8217#issuecomment-1004681145 - + Closes #8223 - test719-721: verify SOCKS details - + Using the new verify/socks details - runtests: add verify/socks check - + If used, this data is compared with the data in log/socksd-request.log which the socksd server logs. - + Added to FILEFORMAT.md - server/socksd: log atyp + address in a separate log - + To allow the test suite to verify that the right data arrived - socks5: use appropriate ATYP for numerical IP address host names - + When not resolving the address locallly (known as socks5h). - + Add test 719 and 720 to verify. - + Reported-by: Peter Piekarski Fixes #8216 Closes #8217 @@ -3792,62 +5514,62 @@ Daniel Stenberg (3 Jan 2022) - RELEASE-NOTES: synced - libtest: avoid "assignment within conditional expression" - + In lib530, lib540 and lib582 - + Closes #8218 - ftp: disable warning 4706 in MSVC - + Follow-up to 21248e052d - + Disabling "assignment within conditional expression" for MSVC needs to be done before the function starts, for it to take effect. - + Closes #8218 - tool_operate: warn if too many output arguments were found - + More output instructions than URLs is likely a user error. - + Add test case 371 to verify - + Closes #8210 - .github/workflows/mbedtls.yml: bump to mbedtls 3.1.0 - + Closes #8215 - zuul: remove the mbedtls jobs - + Now running as github workflows - + Closes #8215 - github/workflows: add mbedtls and mbedtls-clang - + Closes #8215 - [Valentin Richter brought this change] mbedtls: fix private member designations for v3.1.0 - + "As a last resort, you can access the field foo of a structure bar by writing bar.MBEDTLS_PRIVATE(foo). Note that you do so at your own risk, since such code is likely to break in a future minor version of Mbed TLS." - https://github.com/ARMmbed/mbedtls/blob/f2d1199edc5834df4297f247f213e614f7782d1d/docs/3.0-migration-guide.md - + That future minor version is v3.1.0. I set the >= to == for the version checks because v3.1.0 is a release, and I am not sure when the private designation was reverted after v3.0.0. - + Closes #8214 - [Valentin Richter brought this change] cmake: prevent dev warning due to mismatched arg - + -- curl version=[7.81.0-DEV] CMake Warning (dev) at /usr/share/cmake-3.22.1/Modules/FindPackageHandleStandardArgs.cmake:438 (message): The package name passed to `find_package_handle_standard_args` (MBEDTLS) @@ -3858,127 +5580,127 @@ Daniel Stenberg (3 Jan 2022) deps/curl/CMake/FindMbedTLS.cmake:31 (find_package_handle_standard_args) deps/curl/CMakeLists.txt:473 (find_package) This warning is for project developers. Use -Wno-dev to suppress it. - + Closes #8207 - urlapi: if possible, shorten given numerical IPv6 addresses - + Extended test 1560 to verify - + Closes #8206 - [Michał Antoniak brought this change] url: reduce ssl backend count for CURL_DISABLE_PROXY builds - + Closes #8212 - KNOWN_BUGS: "Trying local ports fails on Windows" - + Reported-by: gclinch on github Closes #8112 - misc: update copyright year range - zuul: remove the wolfssl even more - + Follow-up to 1914465cf180d32b3d - examples/multi-single.c: remove WAITMS() - + As it isn't used. - + Reported-by: Melroy van den Berg Fixes #8200 Closes #8201 - gtls: add gnutls include for the session type - + Follow-up to 8fbd6feddfa5 to make it build more universally - m4/curl-compilers: tell clang -Wno-pointer-bool-conversion - + To hush compiler warnings we don't care for: error: address of function 'X' will always evaluate to 'true' - + Fixes #8197 Closes #8198 - http_proxy: don't close the socket (too early) - + ... and double-check in the OpenSSL shutdown that the socket is actually still there before it is used. - + Fixes #8193 Closes #8195 - + Reported-by: Leszek Kubik - ngtcp2: verify the server certificate for the gnutls case - + Closes #8178 - ngtcp2: verify the server cert on connect (quictls) - + Make ngtcp2+quictls correctly acknowledge `CURLOPT_SSL_VERIFYPEER` and `CURLOPT_SSL_VERIFYHOST`. - + The name check now uses a function from lib/vtls/openssl.c which will need attention for when TLS is not done by OpenSSL or is disabled while QUIC is enabled. - + Possibly the servercert() function in openssl.c should be adjusted to be able to use for both regular TLS and QUIC. - + Ref: #8173 Closes #8178 - zuul: remove the wolfssl build - github workflow: add wolfssl - + Closes #8196 - [Nicolas Sterchele brought this change] zuul: fix quiche build pointing to wrong Cargo - + Fixes #8184 Closes #8189 - checksrc: detect more kinds of NULL comparisons we avoid - + Co-authored-by: Jay Satiro Closes #8180 - RELEASE-NOTES: synced - mesalink: remove the BACKEND define kludge - + Closes #8183 - schannel: remove the BACKEND define kludge - + Closes #8182 - gtls: check return code for gnutls_alpn_set_protocols - + Closes #8181 - [Stefan Huber brought this change] README: label the link to the support document - + Closes #8185 - docs/HTTP3: describe how to setup a h3 reverse-proxy for testing - + Assisted-by: Matt Holt - + Closes #8177 - libcurl-multi.3: "SOCKS proxy handshakes" are not blocking - + Since 4a4b63daaa0 - [Vladimir Panteleev brought this change] @@ -3988,49 +5710,49 @@ Daniel Stenberg (3 Jan 2022) - [Vladimir Panteleev brought this change] http: Fix CURLOPT_HTTP200ALIASES - + The httpcode < 100 check was also triggered when none of the fields were parsed, thus making the if(!nc) block unreachable. - + Closes #8171 - RELEASE-NOTES: synced - language: "email" - + Missed three occurrences. - + Follow-up to 7a92f86 - nss:set_cipher don't clobber the cipher list - + The string is set by the user and needs to remain intact for proper connection reuse etc. - + Reported-by: Eric Musser Fixes #8160 Closes #8161 - misc: s/e-mail/email - + Consistency is king. Following the lead in everything curl. - + Closes #8159 - [Tobias Nießen brought this change] docs: fix typo in OpenSSL 3 build instructions - + Closes #8162 - linkcheck.yml: add CI job that checks markdown links - + Closes #8158 - RELEASE-PROCEDURE.md: remove ICAL link and old release dates - BINDINGS.md: "markdown-link-check-disable" - + It feels a bit unfortunate to litter an ugly tag for this functionality, but if we get link scans of all markdown files, this might be worth the price. @@ -4039,23 +5761,23 @@ Daniel Stenberg (3 Jan 2022) Jay Satiro (16 Dec 2021) - openssl: define HAVE_OPENSSL_VERSION for OpenSSL 1.1.0+ - + Prior to this change OpenSSL_version was only detected in configure builds. For other builds the old version parsing code was used which would result in incorrect versioning for OpenSSL 3: - + Before: - + curl 7.80.0 (i386-pc-win32) libcurl/7.80.0 OpenSSL/3.0.0a zlib/1.2.11 WinIDN libssh2/1.9.0 - + After: - + curl 7.80.0 (i386-pc-win32) libcurl/7.80.0 OpenSSL/3.0.1 zlib/1.2.11 WinIDN libssh2/1.9.0 - + Reported-by: lllaffer@users.noreply.github.com - + Fixes https://github.com/curl/curl/issues/8154 Closes https://github.com/curl/curl/pull/8155 @@ -4063,14 +5785,14 @@ Daniel Stenberg (16 Dec 2021) - [James Fuller brought this change] docs: add known bugs list to HTTP3.md - + Closes #8156 Dan Fandrich (15 Dec 2021) - BINDINGS: add one from Everything curl and update a link - libcurl-security.3: mention address and URL mitigations - + The new CURLOPT_PREREQFUNCTION callback is another way to sanitize addresses. Using the curl_url API is a way to mitigate against attacks relying on @@ -4080,16 +5802,16 @@ Daniel Stenberg (15 Dec 2021) - RELEASE-NOTES: synced - x509asn1: return early on errors - + Overhaul to make sure functions that detect errors bail out early with error rather than trying to continue and risk hiding the problem. - + Closes #8147 - [Patrick Monnerat brought this change] openldap: several minor improvements - + - Early check proper LDAP URL syntax. Reject URLs with a userinfo part. - Use dynamic memory for ldap_init_fd() URL rather than a stack-allocated buffer. @@ -4097,28 +5819,28 @@ Daniel Stenberg (15 Dec 2021) connections and alternate authentication credentials. - Do not wait 1 microsecond while polling/reading query response data. - Store last received server code for retrieval with CURLINFO_RESPONSE_CODE. - + Closes #8140 - [Michał Antoniak brought this change] misc: remove unused doh flags when CURL_DISABLE_DOH is defined - + Closes #8148 - mbedtls: fix CURLOPT_SSLCERT_BLOB - + The memory passed to mbedTLS for this needs to be null terminated. - + Reported-by: Florian Van Heghe Closes #8146 - asyn-ares: ares_getaddrinfo needs no happy eyeballs timer - + Closes #8142 - mailmap: add Yongkang Huang - + From #8141 - [Yongkang Huang brought this change] @@ -4126,44 +5848,44 @@ Daniel Stenberg (15 Dec 2021) check ssl_config when re-use proxy connection - mbedtls: do a separate malloc for ca_info_blob - + Since the mbedTLS API requires the data to the null terminated. - + Follow-up to 456c53730d21b1fad0c7f72c1817 - + Fixes #8139 Closes #8145 Marc Hoersken (14 Dec 2021) - CI: build examples for additional code verification - + Some CIs already build them, let's do it on more of them. - + Reviewed-by: Daniel Stenberg - + Follow up to #7690 and 77311f420a541a0de5b3014e0e40ff8b4205d4af Replaces #7591 Closes #7922 - docs/examples: workaround broken -Wno-pedantic-ms-format - + Avoid CURL_FORMAT_CURL_OFF_T by using unsigned long instead. Improve size_t to long conversion in imap-append.c example. - + Ref: https://github.com/curl/curl/issues/6079 Ref: https://github.com/curl/curl/pull/6082 Assisted-by: Jay Satiro Reviewed-by: Daniel Stenberg - + Preparation of #7922 - tests/data/test302[12]: fix MSYS2 path conversion of hostpubsha256 - + Ref: https://www.msys2.org/wiki/Porting/#filesystem-namespaces - + Reviewed-by: Marcel Raad Reviewed-by: Jay Satiro - + Fixes #8084 Closes #8138 @@ -4171,28 +5893,28 @@ Daniel Stenberg (13 Dec 2021) - [Patrick Monnerat brought this change] openldap: simplify ldif generation code - + and take care of zero-length values, avoiding conversion to base64 and/or trailing spaces. - + Closes #8136 - example/progressfunc: remove code for old libcurls - + 7.61.0 is over three years old now, remove all #ifdefs for handling ancient libcurl versions so that the example gets easier to read and understand - + Closes #8137 - [Xiaoke Wang brought this change] sha256/md5: return errors when init fails - + Closes #8133 - TODO: 13.3 Defeat TLS fingerprinting - + Closes #8119 - RELEASE-NOTES: synced @@ -4200,117 +5922,117 @@ Daniel Stenberg (13 Dec 2021) - [Patrick Monnerat brought this change] openldap: process search query response messages one by one - + Upon receiving large result sets, this reduces memory consumption and allows starting to output results while the transfer is still in progress. - + Closes #8101 - hash: lazy-alloc the table in Curl_hash_add() - + This makes Curl_hash_init() infallible which saves error paths. - + Closes #8132 - multi: cleanup the socket hash when destroying it - + Since each socket hash entry may themselves have a hash table in them, the destroying of the socket hash needs to make sure all the subhashes are also correctly destroyed to avoid leaking memory. - + Fixes #8129 Closes #8131 - test1156: fixup the stdout check for Windows - + It is not text mode. - + Follow-up to 6f73e68d182 - + Closes #8134 - test1528: enable for hyper - + Closes #8128 - test1527: enable for hyper - + Closes #8128 - test1526: enable for hyper - + Closes #8128 - test1525: slightly tweaked for hyper - + Closes #8128 - test1156: enable for hyper - + Minor reorg of the lib1156 code and it works fine for hyper. - + Closes #8127 - test661: enable for hyper - + Closes #8126 - docs: fix proselint nits - + - remove a lot of exclamation marks - use consistent spaces (1, not 2) - use better words at some places - + Closes #8123 - [RekGRpth brought this change] BINDINGS.md: add cURL client for PostgreSQL - + Closes #8125 - [RekGRpth brought this change] CURLSHOPT_USERDATA.3: fix copy-paste mistake - + Closes #8124 - docs: fix minor nroff format nits - + Repairs test 1140 - + Follow-up to 436cdf82041 - docs/URL-SYNTAX.md: space is not fine in a given URL - curl_multi_perform/socket_action.3: clarify what errors mean - + An error returned from one of these funtions mean that ALL still ongoing transfers are to be considered failed. - + Ref: #8114 Closes #8120 - libcurl-errors.3: add CURLM_ABORTED_BY_CALLBACK - + Follow-up to #8089 (2b3dd01) - + Closes #8116 - hash: add asserts to help detect bad usage - + For example trying to add entries after the hash has been "cleaned up" - + Closes #8115 - lib530: abort on curl_multi errors - + This makes torture tests run more proper. - + Also add an assert to trap situations where it would end up with no sockets to wait for. - + Closes #8121 - FAQ: we never pronounced it "see URL", we say "kurl" @@ -4318,73 +6040,73 @@ Daniel Stenberg (13 Dec 2021) - RELEASE-NOTES: synced - CURLOPT_RESOLVE.3: minor polish - + Minor rephrasing for some explanations. - + Put the format strings in stand-alone lines with .nf/.fi to be easier to spot. - + Move "added in" to AVAILABILITY - + Closed #8110 - test1556: adjust for hyper - + Closes #8105 - test1554: adjust for hyper - + Closes #8104 - retry-all-errors.d: make the example complete - + ... as it needs --retry too to work - TODO: 5.7 Require HTTP version X or higher - + Closes #7980 - CURLOPT_STDERR.3: does not work with libcurl as a win32 DLL - + This is the exact same limitation already documented for CURLOPT_WRITEDATA but should be clarified here. It also has a different work-around. - + Reported-by: Stephane Pellegrino Bug: https://github.com/curl/curl/issues/8102 Closes #8103 - multi: handle errors returned from socket/timer callbacks - + The callbacks were partially documented to support this. Now the behavior is documented and returning error from either of these callbacks will effectively kill all currently ongoing transfers. - + Added test 530 to verify - + Reported-by: Marcelo Juchem Fixes #8083 Closes #8089 - http2:set_transfer_url() return early on OOM - + If curl_url() returns NULL this should return early to avoid mistakes - even if right now the subsequent function invokes are all OK. - + Coverity (wrongly) pointed out this as a NULL deref. - + Closes #8100 - tool_parsecfg: use correct free() call to free memory - + Detected by Coverity. CID 1494642. Follow-up from 2be1aa619bca - + Closes #8099 - tool_operate: fix potential memory-leak - + A 'CURLU *' would leak if url_proto() is called with no URL. - + Detected by Coverity. CID 1494643. Follow-up to 18270893abdb19 Closes #8098 @@ -4392,50 +6114,50 @@ Daniel Stenberg (13 Dec 2021) - [Patrick Monnerat brought this change] openldap: implement STARTTLS - + As this introduces use of CURLOPT_USE_SSL option for LDAP, also check this option in ldap.c as it is not supported by this backend. - + Closes #8065 - [Jun Tseng brought this change] curl_easy_unescape.3: call curl_easy_cleanup in example - + Closes #8097 - [Jun Tseng brought this change] curl_easy_escape.3: call curl_easy_cleanup in example - + Closes #8097 - tool_listhelp: sync - + Follow-up to 172068b76f - [Damien Walsh brought this change] request.d: refer to 'method' rather than 'command' - + Closes #8094 - RELEASE-NOTES: synced - writeout: fix %{http_version} for HTTP/3 - + Output "3" properly when HTTP/3 was used. - + Reported-by: Bernat Mut Fixes #8072 Closes #8092 - urlapi: accept port number zero - + This is a regression since 7.62.0 (fb30ac5a2d). - + Updated test 1560 accordingly - + Reported-by: Brad Fitzpatrick Fixes #8090 Closes #8091 @@ -4443,26 +6165,26 @@ Daniel Stenberg (13 Dec 2021) - [Mark Dodgson brought this change] lift: ignore is a deprecated config option, use ignoreRules - + Closes #8082 - [Alessandro Ghedini brought this change] HTTP3: update quiche build instructions - + The repo repo was re-organized a bit, so the build instructions need to be updated. - + Closes #8076 - CURLMOPT_TIMERFUNCTION.3: call it expire time, not interval - + Since we say it is a non-repating timer - [Florian Van Heghe brought this change] mbedTLS: include NULL byte in blob data length for CURLOPT_CAINFO_BLOB - + Fixes #8079 Closes #8081 @@ -4470,40 +6192,40 @@ Jay Satiro (2 Dec 2021) - [Wyatt O'Day brought this change] version_win32: Check build number and platform id - + Prior to this change the build number was not checked during version comparison, and the platform id was supposed to be checked but wasn't. - + Checking the build number is required for enabling "evergreen" Windows 10/11 features (like TLS 1.3). - + Ref: https://github.com/curl/curl/pull/7784 - + Closes https://github.com/curl/curl/pull/7824 Closes https://github.com/curl/curl/pull/7867 - libssh2: fix error message for sha256 mismatch - + - On mismatch error show sha256 fingerprint in base64 format. - + Prior to this change the fingerprint was mistakenly printed in binary. Daniel Stenberg (1 Dec 2021) - [Xiaoke Wang brought this change] openssl: check the return value of BIO_new() - + Closes #8078 Dan Fandrich (30 Nov 2021) - docs: Update the Reducing Size section - + Add many more options that can reduce the size of the binary that were added since the last update. Update the sample minimal binary size for version 7.80.0. - tests: Add some missing keywords to tests - + These are needed to skip some tests when configure options have disabled certain features. @@ -4511,56 +6233,56 @@ Daniel Stenberg (30 Nov 2021) - [Florian Van Heghe brought this change] mbedTLS: add support for CURLOPT_CAINFO_BLOB - + Closes #8071 - [Glenn Strauss brought this change] digest: compute user:realm:pass digest w/o userhash - + https://datatracker.ietf.org/doc/html/rfc7616#section-3.4.4 ... the client MUST calculate a hash of the username after any other hash calculation ... - + Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> Closes #8066 - config.d: update documentation to match the path search - + Assisted-by: Jay Satiro - tool_findfile: search for a file in the homedir - + The homedir() function is now renamed into findfile() and iterates over all the environment variables trying to access the file in question until it finds it. Last resort is then getpwuid() if available. Previously it would first try to find a home directory and if that was set, insist on checking only that directory for the file. This now returns the full file name it finds. - + The Windows specific checks are now done differently too and in this order: - + 1 - %USERPROFILE% 2 - %APPDATA% 3 - %USERPROFILE%\\Application Data - + The windows order is modified to match how the Windows 10 ssh tool works when it searches for .ssh/known_hosts. - + Reported-by: jeffrson on github Co-authored-by: Jay Satiro Fixes #8033 Closes #8035 - docs: consistent manpage SYNOPSIS - + Make all libcurl related options use .nf (no fill) for the SYNOPSIS section - for consistent look. roffit then renders that section using <pre> (monospace font) in html for the website. - + Extended manpage-syntax (test 1173) with a basic check for it. - + Closes #8062 - RELEASE-NOTES: synced @@ -4568,65 +6290,65 @@ Daniel Stenberg (30 Nov 2021) - [Patrick Monnerat brought this change] openldap: handle connect phase with a state machine - + Closes #8054 - docs: address proselint nits - + - avoid exclamation marks - use consistent number of spaces after periods: one - avoid clichés - avoid using 'very' - + Closes #8060 - [Bruno Baguette brought this change] FAQ: typo fix : "yout" ➤ "your" - + Closes #8059 - [Bruno Baguette brought this change] docs/INSTALL.md: typo fix : added missing "get" verb - + Closes #8058 - insecure.d: detail its use for SFTP and SCP as well - + Closes #8056 Viktor Szakats (25 Nov 2021) - Makefile.m32: rename -winssl option to -schannel and tidy up - + - accept `-schannel` as an alternative to `CFG` option `-winssl` (latter still accepted, but deprecated) - rename internal variable `WINSSL` to `SCHANNEL` - make the `CFG` option evaluation shorter, without repeating the option name - + Reviewed-by: Marcel Raad Reviewed-by: Daniel Stenberg Closes #8053 Daniel Stenberg (25 Nov 2021) - KNOWN_BUGS: 5.6 make distclean loops forever - + Reported-by: David Bohman Closes #7716 - KNOWN_BUGS: add one, remove one - + - 5.10 SMB tests fail with Python 2 - + Just use python 3. - + + 5.10 curl hangs on SMB upload over stdin - + Closes #7896 - urlapi: provide more detailed return codes - + Previously, the return code CURLUE_MALFORMED_INPUT was used for almost 30 different URL format violations. This made it hard for users to understand why a particular URL was not acceptable. Since the API cannot @@ -4634,67 +6356,67 @@ Daniel Stenberg (25 Nov 2021) instead introduces a number of additional and more fine-grained error codes to allow the API to return more exactly in what "part" or section of the URL a problem was detected. - + Also bug-fixes curl_url_get() with CURLUPART_ZONEID, which previously returned CURLUE_OK even if no zoneid existed. - + Test cases in 1560 have been adjusted and extended. Tests 1538 and 1559 have been updated. - + Updated libcurl-errors.3 and curl_url_strerror() accordingly. - + Closes #8049 - urlapi: make Curl_is_absolute_url always use MAX_SCHEME_LEN - + Instad of having all callers pass in the maximum length, always use it. The passed in length is instead used only as the length of the target buffer for to storing the scheme name in, if used. - + Added the scheme max length restriction to the curl_url_set.3 man page. - + Follow-up to 45bcb2eaa78c79 - + Closes #8047 - [Jay Satiro brought this change] cmake: warn on use of the now deprecated symbols - + Follow-up to 9108da2c26d - + Closes #8052 - [Kevin Burke brought this change] tests/CI.md: add more information on CI environments - + Fixes #8012 Closes #8022 - cmake: private identifiers use CURL_ instead of CMAKE_ prefix - + Since the 'CMAKE_' prefix is reserved for cmake's own private use. Ref: https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html - + Reported-by: Boris Rasin Fixes #7988 Closes #8044 - urlapi: reject short file URLs - + file URLs that are 6 bytes or shorter are not complete. Return CURLUE_MALFORMED_INPUT for those. Extended test 1560 to verify. - + Triggered by #8041 Closes #8042 - curl: improve error message for --head with -J - + ... it now focuses on the "output of headers" combined with the --remote-header-name option, as that is actually the problem. Both --head and --include can output headers. - + Reported-by: nimaje on github Fixes #7987 Closes #8045 @@ -4704,151 +6426,151 @@ Daniel Stenberg (25 Nov 2021) - [Stefan Eissing brought this change] urlapi: cleanup scheme parsing - + Makea Curl_is_absolute_url() always leave a defined 'buf' and avoids copying on urls that do not start with a scheme. - + Closes #8043 - tool_operate: only set SSH related libcurl options for SSH URLs - + For example, this avoids trying to find and set the known_hosts file (or warn for its absence) if SFTP or SCP are not used. - + Closes #8040 - [Jacob Hoffman-Andrews brought this change] rustls: remove comment about checking handshaking - + The comment is incorrect in two ways: - It says the check needs to be last, but the check is actually first. - is_handshaking actually starts out true. - + Closes #8038 Marcel Raad (20 Nov 2021) - openssl: use non-deprecated API to read key parameters - + With OpenSSL 3.0, the parameters are read directly from the `EVP_PKEY` using `EVP_PKEY_get_bn_param`. - + Closes https://github.com/curl/curl/pull/7893 - openssl: reduce code duplication - + `BN_print`'s `BIGNUM` parameter has been `const` since OpenSSL 0.9.4. - + Closes https://github.com/curl/curl/pull/7893 - openssl: remove `RSA_METHOD_FLAG_NO_CHECK` handling if unavailable - + The flag has been deprecated without replacement in OpenSSL 3.0. - + Closes https://github.com/curl/curl/pull/7893 - openssl: remove usage of deprecated `SSL_get_peer_certificate` - + The function name was changed to `SSL_get1_peer_certificate` in OpenSSL 3.0. - + Closes https://github.com/curl/curl/pull/7893 Daniel Stenberg (19 Nov 2021) - page-footer: fix typo - + Closes #8036 - http: enable haproxy support for hyper backend - + This is done by having native code do the haproxy header output before hyper issues its request. The little downside with this approach is that we need the entire Curl_buffer_send() function built, which is otherwise not used for hyper builds. - + If hyper ends up getting native support for the haproxy protocols we can backpedal on this. - + Enables test 1455 and 1456 - + Closes #8034 - [Bernhard Walle brought this change] configure: fix runtime-lib detection on macOS - + With a non-standard installation of openssl we get this error: - + checking run-time libs availability... failed configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lnghttp2 -lssl -lcrypto -lssl -lcrypto -lz - + There's already code to set LD_LIBRARY_PATH on Linux, so set DYLD_LIBRARY_PATH equivalent on macOS. - + Closes #8028 - [Don J Olmstead brought this change] cmake: don't set _USRDLL on a static Windows build - + Closes #8030 - page-footer: document more environment variables - + ... that curl might use. - + Closes #8027 - netrc.d: edit the .netrc example to look nicer - + Works nicely thanks to d1828b470f43d - + Closes #8025 - tftp: mark protocol as not possible to do over CONNECT - + ... and make connect_init() refusing trying to tunnel protocols marked as not working. Avoids a double-free. - + Reported-by: Even Rouault Fixes #8018 Closes #8020 - docs/cmdline-opts: do not say "protocols: all" - + Remove the lines saying "protocols: all". It makes the output in the manpage look funny, and the expectation is probably by default that if not anything is mentioned about protocols the option apply to them all. - + Closes #8021 - curl.1: require "see also" for every documented option - + gen.pl now generates a warning if the "See Also" field is not filled in for a command line option - + All command line options now provide one or more related options. 167 "See alsos" added! - + Closes #8019 - insecure.d: expand and clarify - + Closes #8017 - gen.pl: improve example output format - + Treat consecutive lines that start with a space to be "examples". They are output enclosed by .nf and .fi - + Updated form.d to use this new fanciness - + Closes #8016 - Revert "form-escape.d: double the back-slashes for proper man page output" - + This reverts commit a2d8eac04a4eb1d5a98cf24b4e5cec5cec565d27. - + silly me, it was intended to be one backslash! - form-escape.d: double the back-slashes for proper man page output @@ -4856,25 +6578,25 @@ Daniel Stenberg (19 Nov 2021) - page-footer: add a mention of how to report bugs to the man page - RELEASE-NOTES: synced - + and bump to 7.81.0-DEV - [Patrick Monnerat brought this change] mime: use percent-escaping for multipart form field and file names - + Until now, form field and file names where escaped using the backslash-escaping algorithm defined for multipart mails. This commit replaces this with the percent-escaping method for URLs. - + As this may introduce incompatibilities with server-side applications, a new libcurl option CURLOPT_MIME_OPTIONS with bitmask CURLMIMEOPT_FORMESCAPE is introduced to revert to legacy use of backslash-escaping. This is controlled by new cli tool option --form-escape. - + New tests and documentation are provided for this feature. - + Reported by: Ryan Sleevi Fixes #7789 Closes #7805 @@ -4882,63 +6604,63 @@ Daniel Stenberg (19 Nov 2021) - [Kevin Burke brought this change] zuul.d: update rustls-ffi to version 0.8.2 - + This version fixes errors with ALPN negotiation in rustls, which is necessary for HTTP/2 support. For more information see the rustls-ffi changelog. - + Closes #8013 - configure: better diagnostics if hyper is built wrong - + If hyper is indeed present in the specified directory but couldn't be used to find the correct symbol, then offer a different error message to better help the user understand the issue. - + Suggested-by: Jacob Hoffman-Andrews Fixes #8001 Closes #8005 - test1939: require proxy support to run - + Follow-up to f0b7099a10d1a - + Closes #8011 - test302[12]: run only with the libssh2 backend - + ... as the others don't support --hostpubsha256 - + Reported-by: Paul Howarth Fixes #8009 Closes #8010 - runtests: make the SSH library a testable feature - + libssh2, libssh and wolfssh - [Jacob Hoffman-Andrews brought this change] rustls: read of zero bytes might be okay - + When we're reading out plaintext from rustls' internal buffers, we might get a read of zero bytes (meaning a clean TCP close, including close_notify). However, we shouldn't return immediately when that happens, since we may have already copied out some plaintext bytes. Break out of the loop when we get a read of zero bytes, and figure out which path we're dealing with. - + Acked-by: Kevin Burke - + Closes #8003 - [Jacob Hoffman-Andrews brought this change] rustls: remove incorrect EOF check - + The update to rustls-ffi 0.8.0 changed handling of EOF and close_notify. From the CHANGELOG: - + > Handling of unclean close and the close_notify TLS alert. Mirroring > upstream changes, a rustls_connection now tracks TCP closed state like > so: rustls_connection_read_tls considers a 0-length read from its @@ -4950,111 +6672,111 @@ Daniel Stenberg (19 Nov 2021) > getting length information from your protocol (e.g. Content-Length in > HTTP) you may choose to ignore UNEXPECTED_EOF so long as the number of > plaintext bytes was as expected. - + That means we don't need to check for unclean EOF in `cr_recv()`, because `process_new_packets()` will give us an error if appropriate. - + Closes #8003 - lib1939: make it endure torture tests - + Follow-up to f0b7099a10d1a - + Closes #8007 - azure: make the "w/o HTTP/SMTP/IMAP" build disable SSL proper - + The configure line would previously depend on a configure mistake using --without-openssl that is fixed and now this configure line needs adjusting to use --without-ssl. - + Follow-up to b589696f0312d - + Closes #8006 - [Jacob Hoffman-Andrews brought this change] configure: add -lm to configure for rustls build. - + Note: The list of libraries that rustc tells us we need to include is longer, but also includes some more platform-specific libraries that I am not sure how to effectively incorporate. Adding just -lm seems to solve an immediate problem, so I'm adding just that. - + Closes #8002 - curl_share_setopt.3: refer to CURLSHOPT_USERDATA(3) properly - curl_share_setopt.3: split out options into their own manpages - + CURLSHOPT_LOCKFUNC.3 CURLSHOPT_SHARE.3 CURLSHOPT_UNLOCKFUNC.3 CURLSHOPT_UNSHARE.3 CURLSHOPT_USERDATA.3 - + Closes #7998 - http_proxy: make Curl_connect_done() work for proxy disabled builds - + ... by making it an empty macro then. - + Follow-up to f0b7099a10d1a Reported-by: Vincent Grande Fixes #7995 Closes #7996 - Curl_connect_done: handle being called twice - + Follow-up to f0b7099a10d1a7c - + When torture testing 1021, it turns out the Curl_connect_done function might be called twice and that previously then wrongly cleared the HTTP pointer in the second invoke. - + Closes #7999 - [Stan Hu brought this change] configure: don't enable TLS when --without-* flags are used - + Previously specifying `--without-gnutls` would unexpectedly attempt to compile with GnuTLS, effectively interpreting this as `--with-gnutls`. This caused a significant amount of confusion when `libcurl` was built with SSL disabled since GnuTLS wasn't present. - + 68d89f24 dropped the `--without-*` options from the configure help, but `AC_ARG_WITH` still defines these flags automatically. As https://www.gnu.org/software/autoconf/manual/autoconf-2.60/html_node/External-Software.html describes, the `action-if-given` is called when the user specifies `--with-*` or `--without-*` options. - + To prevent this confusion, we make the `--without` flag do the right thing by ignoring the value if it set to "no". - + Closes #7994 - [Rikard Falkeborn brought this change] docs/checksrc: Add documentation for STRERROR - + Closes #7991 - vtls/rustls: adapt to the updated rustls_version proto - + Closes #7956 - [Kevin Burke brought this change] vtls/rustls: handle RUSTLS_RESULT_PLAINTEXT_EMPTY - + Previously we'd return CURLE_READ_ERROR if we received this, instead of triggering the error handling logic that's present in the next if block down. - + After this change, curl requests to https://go.googlesource.com using HTTP/2 complete successfully. - + Fixes #7949 Closes #7948 @@ -5065,49 +6787,49 @@ Daniel Stenberg (19 Nov 2021) - [Kevin Burke brought this change] vtls/rustls: update to compile with rustls-ffi v0.8.0 - + Some method names, as well as the generated library name, were changed in a recent refactoring. - + Further, change the default configuration instructions to check for Hyper in either "target/debug" or "target/release" - the latter contains an optimized build configuration. - + Fixes #7947 Closes #7948 - RELEASE-NOTES: synced - + and bump the version to 7.80.1 - multi: shut down CONNECT in Curl_detach_connnection - + ... to prevent a lingering pointer that would lead to a double-free. - + Added test 1939 to verify. - + Reported-by: Stephen M. Coakley Fixes #7982 Closes #7986 - curl_easy_cleanup.3: remove from multi handle first - + Easy handles that are used by the multi interface should be removed from the multi handle before they are cleaned up. - + Reported-by: Stephen M. Coakley Ref: #7982 Closes #7983 - url.c: fix the SIGPIPE comment for Curl_close - + Closes #7984 Version 7.80.0 (10 Nov 2021) Daniel Stenberg (10 Nov 2021) - RELEASE-NOTES: synced - + for curl 7.80.0 - THANKS: add contributors from the 7.80.0 cycle @@ -5115,40 +6837,40 @@ Daniel Stenberg (10 Nov 2021) - [Tatsuhiro Tsujikawa brought this change] ngtcp2: advertise h3 as well as h3-29 - + Advertise h3 as well as h3-29 since some servers out there require h3 for QUIC v1. - + Closes #7979 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: use QUIC v1 consistently - + Since we switched to v1 quic_transport_parameters codepoint in #7960 with quictls, lets use QUIC v1 consistently. - + Closes #7979 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: compile with the latest nghttp3 - + Closes #7978 Marc Hoersken (9 Nov 2021) - tests: add Schannel-specific tests and disable unsupported ones - + Adds Schannel variants of SSLpinning tests that include the option --ssl-revoke-best-effort to ignore certificate revocation check failures which is required due to our custom test CA certificate. - + Disable the original variants if the Schannel backend is enabled. - + Also skip all IDN tests which are broken while using an msys shell. - + This is a step to simplify test exclusions for Windows and MinGW. - + Reviewed-by: Jay Satiro Reviewed-by: Marcel Raad Reviewed-by: Daniel Stenberg @@ -5156,108 +6878,108 @@ Marc Hoersken (9 Nov 2021) Daniel Stenberg (8 Nov 2021) - docs: NAME fixes in easy option man pages - + Closes #7975 - [Roger Young brought this change] ftp: make the MKD retry to retry once per directory - + Reported-by: Roger Young Fixes #7967 Closes #7976 - tool_operate: reorder code to avoid compiler warning - + tool_operate.c(889) : warning C4701: potentially uninitialized local variable 'per' use - + Follow-up to cc71d352651a0d95 Reported-by: Marc Hörsken Bug: https://github.com/curl/curl/pull/7922#issuecomment-963042676 Closes #7971 - curl_easy_perform.3: add a para about recv and send data - + Reported-by: Godwin Stewart Fixes #7973 Closes #7974 - tool_operate: fclose stream only if fopened - + Fixes torture test failures Follow-up to cc71d352651 - + Closes #7972 - libcurl-easy.3: language polish - limit-rate.d: this is average over several seconds - + Closes #7970 - docs: reduce/avoid English contractions - + You're => You are Hasn't => Has not Doesn't => Does not Don't => Do not You'll => You will etc - + Closes #7930 - tool_operate: fix torture leaks with etags - + Spotted by torture testing 343 344 345 347. - + Follow-up from cc71d352651a0 Pointed-out-by: Dan Fandrich - + Closes #7969 - [Amaury Denoyelle brought this change] ngtcp2: support latest QUIC TLS RFC9001 - + QUIC Transport Parameters Extension has been changed between draft-29 and latest RFC9001. Most notably, its identifier has been updated from 0xffa5 to 0x0039. The version is selected through the QUIC TLS library via the legacy codepoint. - + Disable the usage of legacy codepoint in curl to switch to latest RFC9001. This is required to be able to keep up with latest QUIC implementations. - + Acked-by: Tatsuhiro Tsujikawa Closes #7960 - test1173: make manpage-syntax.pl spot \n errors in examples - man pages: fix backslash-n in examples - + ... to be proper backslash-backslash-n sequences to render nicely in man and on website. - + Follow-up to 24155569d8a Reported-by: Sergey Markelov - + Fixes https://github.com/curl/curl-www/issues/163 Closes #7962 - scripts/release-notes.pl: use out of repo links verbatim in refs - tool_operate: a failed etag save now only fails that transfer - + When failing to create the output file for saving an etag, only fail that particular single transfer and allow others to follow. - + In a serial transfer setup, if no transfer at all is done due to them all being skipped because of this error, curl will output an error message and return exit code 26. - + Added test 369 and 370 to verify. - + Reported-by: Earnestly on github Ref: #7942 Closes #7945 @@ -5265,60 +6987,60 @@ Daniel Stenberg (8 Nov 2021) - [Kevin Burke brought this change] .github: retry macos "brew install" command on failure - + Previously we saw errors attempting to run "brew install", see https://github.com/curl/curl/runs/4095721123?check_suite_focus=true for an example, since this command is idempotent, it is safe to run again. - + Closes #7955 - CURLOPT_ALTSVC_CTRL.3: mention conn reuse is preferred - + Ref: https://github.com/curl/curl/discussions/7954 - + Closes #7957 - RELEASE-NOTES: synced - zuul: pin the quiche build to use an older cmake-rs - + The latest cmake-rs assumes cmake's --parallel works. That was added in cmake 3.12, but a lot of our CI builds run on Ubuntu Bionic which only has cmake 3.10. - + Fixes #7927 Closes #7952 - [Marc Hoersken brought this change] Revert "src/tool_filetime: disable -Wformat on mingw for this file" - + This reverts commit 7c88fe375b15c44d77bccc9ab733b8069d228e6f. - + Follow up to #6535 as the pragma is obsolete with warnf - + Closes #7941 Jay Satiro (2 Nov 2021) - schannel: fix memory leak due to failed SSL connection - + - Call schannel_shutdown if the SSL connection fails. - + Prior to this change schannel_shutdown (which shuts down the SSL connection as well as memory cleanup) was not called when the SSL connection failed (eg due to failed handshake). - + Co-authored-by: Gisle Vanem - + Fixes https://github.com/curl/curl/issues/7877 Closes https://github.com/curl/curl/pull/7878 Daniel Stenberg (2 Nov 2021) - Curl_updateconninfo: store addresses for QUIC connections too - + So that CURLINFO_PRIMARY_IP etc work for HTTP/3 like for other HTTP versions. - + Reported-by: Jerome Mao Fixes #7939 Closes #7944 @@ -5326,80 +7048,80 @@ Daniel Stenberg (2 Nov 2021) - [Sergio Durigan Junior brought this change] curl.1: fix typos in the manpage - + s/transfering/transferring/ s/transfered/transferred/ - + Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net> Closes #7937 Marc Hoersken (1 Nov 2021) - tests/smbserver.py: fix compatibility with impacket 0.9.23+ - + impacket now performs sanity checks if the requested and to be served file path actually is inside the real share path. - + Ref: https://github.com/SecureAuthCorp/impacket/pull/1066 - + Fixes #7924 Closes #7935 Daniel Stenberg (1 Nov 2021) - docs: reduce use of "very" - + "Very" should be avoided in most texts. If intensifiers are needed, try find better words instead. - + Closes #7936 - [Tatsuhiro Tsujikawa brought this change] ngtcp2: specify the missing required callback functions - + Closes #7929 - CURLOPT_[PROXY]_SSL_CIPHER_LIST.3: bold instead of quote - + Bold the example ciphers instead of using single quotes, which then also avoids the problem of how to use single quotes when first in a line. - + Also rephrased the pages a little. - + Reported-by: Sergio Durigan Junior Ref: #7928 Closes #7934 - gen.pl: replace leading single quotes with \(aq - + ... and allow single quotes to be used "normally" in the .d files. - + Makes the output curl.1 use better nroff. - + Reported-by: Sergio Durigan Junior Ref: #7928 Closes #7933 Marc Hoersken (1 Nov 2021) - tests: kill some test servers afterwards to avoid locked logfiles - + Reviewed-by: Daniel Stenberg Closes #7925 Daniel Stenberg (1 Nov 2021) - smooth-gtk-thread.c: enhance the mutex lock use - + Reported-by: ryancaicse on github Fixes #7926 Closes #7931 Marc Hoersken (31 Oct 2021) - CI/runtests.pl: restore -u flag, but remove it from CI runs - + This makes it possible to use -u again for local testing, but removes the flag from CI config files and make targets. - + Reviewed-by: Daniel Stenberg - + Partially reverts #7841 Closes #7921 @@ -5407,15 +7129,15 @@ Daniel Stenberg (29 Oct 2021) - [Jonathan Cardoso Machado brought this change] CURLOPT_HSTSWRITEFUNCTION.3: using CURLOPT_HSTS_CTRL is required - + Closes #7923 - [Axel Morawietz brought this change] imap: display quota information - + Show response to "GETQUOTAROOT INBOX" command. - + Closes #6973 - RELEASE-NOTES: synced @@ -5423,235 +7145,235 @@ Daniel Stenberg (29 Oct 2021) - [Boris Rasin brought this change] cmake: fix error getting LOCATION property on non-imported target - + Closes #7885 - [Xiaoke Wang brought this change] url: check the return value of curl_url() - + Closes #7917 - [Roy Li brought this change] configure.ac: replace krb5-config with pkg-config - + The rationale is that custom *-config tools don't work well when cross-compiling or using sysroots (such as when using Yocto project) and require custom fixing for each of them; pkg-config on the other hand works similarly everywhere. - + Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Alexander Kanavin <alex@linutronix.de> - + Closes #7916 - test1160: edited to work with hyper - + Closes #7912 - data/DISABLED: enable tests that now work with hyper - + Closes #7911 - test559: add 'HTTP' in keywords - + Makes it run fine with hyper - + Closes #7911 - test552: updated to work with hyper - + Closes #7911 Marc Hoersken (27 Oct 2021) - github: fix incomplete permission to label PRs for Hacktoberfest - + Unfortunately the GitHub API requires a token with write permission for both issues and pull-requests to edit labels on even just PRs. - + Follow up to #7897 Daniel Stenberg (27 Oct 2021) - opt-manpages: use 'Added in' instead of 'Since' - + Closes #7913 Marc Hoersken (27 Oct 2021) - github: fix missing permission to label PRs for Hacktoberfest - + Follow up to #7897 - + Test references to see if permissions are now sufficient: - + Closes #7832 Closes #7897 - CI: more use of test-ci make target and verbose output - + Replace test-nonflaky with test-ci and enable verbose output in all remaining CIs except Zuul which is customized a lot. - + Reviewed-by: Daniel Stenberg Reviewed-by: Jay Satiro - + Follow up to #7785 Closes #7832 - github: add support for Hacktoberfest using labels - + Automatically add hacktoberfest-accepted label to PRs opened between September 30th and November 1st once a commit with a close reference to it is pushed onto the master branch. - + With this workflow we can participate in Hacktoberfest while not relying on GitHub to identify PRs as merged due to our rebasing. - + Requires hacktoberfest-accepted labels to exist for PRs on the participating repository. Also requires hacktoberfest topic on the participating repository to avoid applying to forked repos. - + Reviewed-by: Daniel Stenberg - + Fixes #7865 Closes #7897 Daniel Stenberg (27 Oct 2021) - http: reject HTTP response codes < 100 - + ... which then also includes negative ones as test 1430 uses. - + This makes native + hyper backend act identically on this and therefore test 1430 can now be enabled when building with hyper. Adjust test 1431 as well. - + Closes #7909 - [Kerem Kat brought this change] docs: fix typo in CURLOPT_TRAILERFUNCTION example - + Closes #7910 - docs/HYPER: remove some remaining issues, add HTTP/0.9 limitation - configure: when hyper is selected, deselect nghttp2 - + Closes #7908 - [Patrick Monnerat brought this change] sendf: accept zero-length data in Curl_client_write() - + Historically, Curl_client_write() used a length value of 0 as a marker for a null-terminated data string. This feature has been removed in commit f4b85d2. To detect leftover uses of the feature, a DEBUGASSERT statement rejecting a length with value 0 was introduced, effectively precluding use of this function with zero-length data. - + The current commit removes the DEBUGASSERT and makes the function to return immediately if length is 0. - + A direct effect is to fix trying to output a zero-length distinguished name in openldap. - + Another DEBUGASSERT statement is also rephrased for better readability. - + Closes #7898 - hyper: disable test 1294 since hyper doesn't allow such crazy headers - + Closes #7905 - c-hyper: make CURLOPT_SUPPRESS_CONNECT_HEADERS work - + Verified by the enabled test 1288 - + Closes #7905 - test1287: make work on hyper - + Closes #7905 - test1266/1267: disabled on hyper: no HTTP/0.9 support - + Closes #7905 Viktor Szakats (25 Oct 2021) - Makefile.m32: fix to not require OpenSSL with -libssh2 or -rtmp options - + Previously, -libssh2/-rtmp options assumed that OpenSSL is also enabled (and then failed with an error when not finding expected OpenSSL headers), but this isn't necessarly true, e.g. when building both libssh2 and curl against Schannel. This patch makes sure to only enable the OpenSSL backend with -libssh2/-rtmp, when there was no SSL option explicitly selected. - + - Re-implement the logic as a single block of script. - Also fix an indentation while there. - + Assisted-by: Jay Satiro - + Closes #7895 Daniel Stenberg (25 Oct 2021) - docs: consistent use of "Added in" - + Make them all say "Added in [version]" without using 'curl' or 'libcurl' in that phrase. - man pages: require all to use the same section header order - + This is the same order we already enforce among the options' man pages: consistency is good. Add lots of previously missing examples. - + Adjust the manpage-syntax script for this purpose, used in test 1173. - + Closes #7904 - [David Hu brought this change] docs/HTTP3: improve build instructions - + 1. If writing to a system path if the command is not prefixed with `sudo` it will cause a permission denied error - + 2. The patched OpenSSL branch has been updated to `openssl-3.0.0+quic` to match upstream OpenSSL version. - + 3. We should not disable GnuTLS docs. - + Updated some commands about `make install` - + Closes #7842 - [Ricardo Martins brought this change] CMake: restore support for SecureTransport on iOS - + Restore support for building curl for iOS with SecureTransport enabled. - + Closes #7501 - tests: enable more tests with hyper - + Adjusted 1144, 1164 and 1176. - + Closes #7900 - docs: provide "RETURN VALUE" section for more func manpages - + Three were missing, one used a non-standard name for the header. - + Closes #7902 Jay Satiro (25 Oct 2021) - curl_multi_socket_action.3: add a "RETURN VALUE" section - + .. because it may not be immediately clear to the user what curl_multi_socket_action returns. - + Ref: https://curl.se/mail/lib-2021-10/0035.html - + Closes https://github.com/curl/curl/pull/7901 Daniel Stenberg (24 Oct 2021) @@ -5660,1832 +7382,74 @@ Daniel Stenberg (24 Oct 2021) - [Samuel Henrique brought this change] tests: use python3 in test 1451 - + This is a continuation of commit ec91b5a69000bea0794bbb3 in which changing this test was missed. There are no other python2 leftovers now. - + Based on a Debian patch originally written by Alessandro Ghedini <ghedo@debian.org> - + Closes #7899 - [Eddie Lumpkin brought this change] lib: fixing comment spelling typos in lib files - + Closes #7894 Signed-off-by: ewlumpkin <ewlumpkin@gmail.com> - openssl: if verifypeer is not requested, skip the CA loading - + It was previously done mostly to show a match/non-match in the verbose output even when verification was not asked for. This change skips the loading of the CA certs unless verifypeer is set to save memory and CPU. - + Closes #7892 - curl-confopts.m4: remove --enable/disable-hidden-symbols - + These configure options have been saying "deprecated" since 9e24b9c7af (April 2012). It was about time we remove them. - + Closes #7891 - c-hyper: don't abort CONNECT responses early when auth-in-progress - + ... and make sure to stop ignoring the body once the CONNECT is done. - + This should make test 206 work proper again and not be flaky. - + Closes #7889 - hyper: does not support disabling CURLOPT_HTTP_TRANSFER_DECODING - + Simply because hyper doesn't have this ability. Mentioned in docs now. - + Skip test 326 then - + Closes #7889 - test262: don't attempt with hyper - + This test verifies that curl works with binary zeroes in HTTP response headers and hyper refuses such. They're not kosher http. - + Closes #7889 - c-hyper: make test 217 run - + Closes #7889 - DISABLED: enable test 209+213 for hyper - + Follow-up to 823d3ab855c - + Closes #7889 - test207: accept a different error code for hyper - + It returns HYPERE_UNEXPECTED_EOF for this case which we convert to the somewhat generic CURLE_RECV_ERROR. - - Closes #7889 - -- [Érico Nogueira brought this change] - - INSTALL: update symbol hiding option - - --enable-hidden-symbols was deprecated in - 9e24b9c7afbcb81120af4cf3f6cdee49a06d8224. - - Closes #7890 - -- http_proxy: multiple CONNECT with hyper done better - - Enabled test 206 - - Closes #7888 - -- hyper: pass the CONNECT line to the debug callback - - Closes #7887 - -- mailmap: Malik Idrees Hasan Khan - -Jay Satiro (21 Oct 2021) -- [Malik Idrees Hasan Khan brought this change] - - build: fix typos - - Closes https://github.com/curl/curl/pull/7886 - -- URL-SYNTAX: add IMAP UID SEARCH example - - - Explain the difference between IMAP search via URL (which returns - message sequence numbers) and IMAP search via custom request (which - can return UID numbers if prefixed with UID, eg "UID SEARCH ..."). - - Bug: https://github.com/curl/curl/issues/7626 - Reported-by: orycho@users.noreply.github.com - - Ref: https://github.com/curl/curl/issues/2789 - - Closes https://github.com/curl/curl/pull/7881 - -Daniel Stenberg (20 Oct 2021) -- manpage: adjust the asterisk in some SYNOPSIS sections - - Closes #7884 - -- curl_multi_perform.3: polish wording - - - simplify the example by using curl_multi_poll - - - mention curl_multi_add_handle in the text - - - cut out the description of pre-7.20.0 return code behavior - that version - is now more than eleven years old and is basically no longer out there - - - adjust the "typical usage" to mention curl_multi_poll - - Closes #7883 - -- docs/THANKS: removed on request - -- FAQ: polish the explanation of libcurl - -- curl_easy_perform.3: minor wording tweak - -- [Erik Stenlund brought this change] - - mime: mention CURL_DISABLE_MIME in comment - - CURL_DISABLE_MIME is not mentioned in the comment describing the if else - preprocessor directive. - - Closes #7882 - -- tls: remove newline from three infof() calls - - Follow-up to e7416cf - - Reported-by: billionai on github - Fixes #7879 - Closes #7880 - -- RELEASE-NOTES: synced - -- curl_gssapi: fix build warnings by removing const - - Follow-up to 20e980f85b0ea6 - - In #7875 these inits were modified but I get two warnings that these new - typecasts are necessary for. - - Closes #7876 - -- [Bo Anderson brought this change] - - curl_gssapi: fix link error on macOS Monterey - - Fixes #7657 - Closes #7875 - -- test1185: verify checksrc - - Closes #7866 - -- checksrc: improve the SPACESEMICOLON error message - - and adjust the MULTISPACE one to use plural - - Closes #7866 - -- url: set "k->size" -1 at start of request - - The size of the transfer is unknown at that point. - - Fixes #7871 - Closes #7872 - -Daniel Gustafsson (18 Oct 2021) -- doh: remove experimental code for DoH with GET - - The code for sending DoH requests with GET was never enabled in a way - such that it could be used or tested. As there haven't been requests - for this feature, and since it at this is effectively dead, remove it - and favor reimplementing the feature in case anyone is interested. - - Closes #7870 - Reviewed-by: Daniel Stenberg <daniel@haxx.se> - -Daniel Stenberg (18 Oct 2021) -- cirrus: remove FreeBSD 11.4 from the matrix - - It has reached End-Of-Life and causes some LDAP CI issues. - - Closes #7869 - -- cirrus: switch to openldap24-client - - ... as it seems openldap-client doesn't exist anymore. - - Reported-by: Jay Satiro - Fixes #7868 - Closes #7869 - -- checksrc: ignore preprocessor lines - - In order to check the actual code better, checksrc now ignores - everything that look like preprocessor instructions. It also means - that code in macros are now longer checked. - - Note that some rules then still don't need to be followed when code is - exactly below a cpp instruction. - - Removes two checksrc exceptions we needed previously because of - preprocessor lines being checked. - - Reported-by: Marcel Raad - Fixes #7863 - Closes #7864 - -- urlapi: skip a strlen(), pass in zero - - ... to let curl_easy_escape() itself do the strlen. This avoids a (false - positive) Coverity warning and it avoids us having to store the strlen() - return value in an int variable. - - Reviewed-by: Daniel Gustafsson - Closes #7862 - -- misc: update copyright years - -- examples/htmltidy: correct wrong printf() use - - ... and update the includes to match how current htmltidy wants them - used. - - Reported-by: Stathis Kapnidis - Fixes #7860 - Closes #7861 - -Jay Satiro (15 Oct 2021) -- http: set content length earlier - - - Make content length (ie download size) accessible to the user in the - header callback, but only after all headers have been processed (ie - only in the final call to the header callback). - - Background: - - For a long time the content length could be retrieved in the header - callback via CURLINFO_CONTENT_LENGTH_DOWNLOAD_T as soon as it was parsed - by curl. - - Changes were made in 8a16e54 (precedes 7.79.0) to ignore content length - if any transfer encoding is used. A side effect of that was that - content length was not set by libcurl until after the header callback - was called the final time, because until all headers are processed it - cannot be determined if content length is valid. - - This change keeps the same intention --all headers must be processed-- - but now the content length is available before the final call to the - header function that indicates all headers have been processed (ie - a blank header). - - Bug: https://github.com/curl/curl/commit/8a16e54#r57374914 - Reported-by: sergio-nsk@users.noreply.github.com - - Co-authored-by: Daniel Stenberg - - Fixes https://github.com/curl/curl/issues/7804 - Closes https://github.com/curl/curl/pull/7803 - -Daniel Stenberg (15 Oct 2021) -- [Abhinav Singh brought this change] - - aws-sigv4: make signature work when post data is binary - - User sets the post fields size for binary data. Hence, we should not be - using strlen on it. - - Added test 1937 and 1938 to verify. - - Closes #7844 - -- [a1346054 brought this change] - - MacOSX-Framework: remove redundant ';' - - Closes #7859 - -- RELEASE-NOTES: synced - -- openssl: with OpenSSL 1.1.0+ a failed RAND_status means goaway - - One reason we know it can fail is if a provider is used that doesn't do - a proper job or is wrongly configured. - - Reported-by: Michael Baentsch - Fixes #7840 - Closes #7856 - -Marcel Raad (14 Oct 2021) -- [Ryan Mast brought this change] - - cmake: add CURL_ENABLE_SSL option and make CMAKE_USE_* SSL backend options depend on it - - Closes https://github.com/curl/curl/pull/7822 - -Daniel Stenberg (14 Oct 2021) -- http: remove assert that breaks hyper - - Reported-by: Jay Satiro - Fixes #7852 - Closes #7855 - -- http_proxy: fix one more result assign for hyper - - and remove the bad assert again, since it was run even with no error! - - Closes #7854 - -Jay Satiro (14 Oct 2021) -- sws: fix memory leak on exit - - - Free the allocated http request struct on cleanup. - - Prior to this change if sws was built with leak sanitizer it would - report a memory leak error during testing. - - Closes https://github.com/curl/curl/pull/7849 - -Daniel Stenberg (14 Oct 2021) -- c-hyper: make Curl_http propagate errors better - - Pass on better return codes when errors occur within Curl_http instead - of insisting that CURLE_OUT_OF_MEMORY is the only possible one. - - Pointed-out-by: Jay Satiro - Closes #7851 - -- http_proxy: make hyper CONNECT() return the correct error code - - For every 'goto error', make sure the result variable holds the error - code for what went wrong. - - Reported-by: Rafał Mikrut - Fixes #7825 - Closes #7846 - -- docs/Makefile.am: repair 'make html' - - by removing index.html which isn't around anymore - - Closes #7853 - -- [Борис Верховский brought this change] - - curl: correct grammar in generated libcurl code - - Closes #7802 - -- tests: disable test 2043 - - It uses revoked.badssl.com which now is expired and therefor this now - permafails. We should not use external sites for tests, this test should - be converted to use our own infra. - - Closes #7845 - -- runtests: split out ignored tests - - Report ignore tests separately from the actual fails. - - Don't exit non-zero if test servers couldn't get killed. - - Assisted-by: Jay Satiro - - Fixes #7818 - Closes #7841 - -- http2: make getsock not wait for write if there's no remote window - - While uploading, check for remote window availability in the getsock - function so that we don't wait for a writable socket if no data can be - sent. - - Reported-by: Steini2000 on github - Fixes #7821 - Closes #7839 - -- test368: verify dash is appended for "-r [num]" - - Follow-up to 8758a26f8878 - -- [Борис Верховский brought this change] - - curl: actually append "-" to --range without number only - - Closes #7837 - -- RELEASE-NOTES: synced - -- urlapi: URL decode percent-encoded host names - - The host name is stored decoded and can be encoded when used to extract - the full URL. By default when extracting the URL, the host name will not - be URL encoded to work as similar as possible as before. When not URL - encoding the host name, the '%' character will however still be encoded. - - Getting the URL with the CURLU_URLENCODE flag set will percent encode - the host name part. - - As a bonus, setting the host name part with curl_url_set() no longer - accepts a name that contains space, CR or LF. - - Test 1560 has been extended to verify percent encodings. - - Reported-by: Noam Moshe - Reported-by: Sharon Brizinov - Reported-by: Raul Onitza-Klugman - Reported-by: Kirill Efimov - Fixes #7830 - Closes #7834 - -Marc Hoersken (8 Oct 2021) -- CI/makefiles: introduce dedicated test target - - Make it easy to use the same set of test flags - throughout all current and future CI builds. - - Reviewed-by: Jay Satiro - - Follow up to #7690 - Closes #7785 - -Daniel Stenberg (8 Oct 2021) -- maketgz: redirect updatemanpages.pl output to /dev/null - -- CURLOPT_HTTPHEADER.3: add descripion for specific headers - - Settting Host: or Transfer-Encoding: chunked actually have special - meanings to libcurl. This change tries to document them - - Closes #7829 - -- c-hyper: use hyper_request_set_uri_parts to make h2 better - - and make sure to not send Host: over h2. - - Fixes #7679 - Reported-by: David Cook - Closes #7827 - -- [Michael Afanasiev brought this change] - - curl-openssl.m4: modify library order for openssl linking - - lcrypto may depend on lz, and configure corrently fails with when - statically linking as the order is "-lz -lcrypto". This commit switches - the order to "-lcrypto -lz". - - Closes #7826 - -Marcel Raad (7 Oct 2021) -- sha256: use high-level EVP interface for OpenSSL - - Available since OpenSSL 0.9.7. The low-level SHA256 interface is - deprecated in OpenSSL v3, and its usage was discouraged even before. - - Closes https://github.com/curl/curl/pull/7808 - -- curl_ntlm_core: use OpenSSL only if DES is available - - This selects another SSL backend then if available, or otherwise at - least gives a meaningful error message. - - Closes https://github.com/curl/curl/pull/7808 - -- md5: fix compilation with OpenSSL 3.0 API - - Only use OpenSSL's MD5 code if it's available. - - Also fix wolfSSL build with `NO_MD5`, in which case neither the - wolfSSL/OpenSSL implementation nor the fallback implementation was - used. - - Closes https://github.com/curl/curl/pull/7808 - -Daniel Stenberg (7 Oct 2021) -- print_category: printf %*s needs an int argument - - ... not a size_t! - - Detected by Coverity: CID 1492331. - Closes #7823 - -Jay Satiro (7 Oct 2021) -- version_win32: use actual version instead of manifested version - - - Use RtlVerifyVersionInfo instead of VerifyVersionInfo, when possible. - - Later versions of Windows have normal version functions that compare and - return versions based on the way the application is manifested, instead - of the actual version of Windows the application is running on. We - prefer the actual version of Windows so we'll now call the Rtl variant - of version functions (RtlVerifyVersionInfo) which does a proper - comparison of the actual version. - - Reported-by: Wyatt O'Day - - Ref: https://github.com/curl/curl/pull/7727 - - Fixes https://github.com/curl/curl/issues/7742 - Closes https://github.com/curl/curl/pull/7810 - -Daniel Stenberg (6 Oct 2021) -- RELEASE-NOTES: synced - -- http: fix Basic auth with empty name field in URL - - Add test 367 to verify. - - Reported-by: Rick Lane - Fixes #7819 - Closes #7820 - -- [Jeffrey Tolar brought this change] - - CURLOPT_MAXLIFETIME_CONN: maximum allowed lifetime for conn reuse - - ... and close connections that are too old instead of reusing them. - - By default, this behavior is disabled. - - Bug: https://curl.se/mail/lib-2021-09/0058.html - Closes #7751 - -Daniel Gustafsson (6 Oct 2021) -- docs/examples: add missing binaries to gitignore - - Commit f65d7889b added getreferrer, and commit ae8e11ed5 multi-legacy, - both of which missed adding .gitignore clauses for the built binaries. - - Closes #7817 - Reviewed-by: Daniel Stenberg <daniel@haxx.se> - -Daniel Stenberg (5 Oct 2021) -- [Josip Medved brought this change] - - HTTP3: fix the HTTP/3 Explained book link - - Closes #7813 - -- [Lucas Holt brought this change] - - misc: fix a few issues on MidnightBSD - - Closes #7812 - -Daniel Gustafsson (4 Oct 2021) -- [8U61ife brought this change] - tool_main: fix typo in comment - - Closes: #7811 - Reviewed-by: Daniel Gustafsson <daniel@yesql.se> - -Daniel Stenberg (4 Oct 2021) -- [Ryan Mast brought this change] - - BINDINGS: URL updates - - For cpr, BBHTTP, Eiffel, Harbour, Haskell, Mono, and Rust - - Closes #7809 - -- scripts/delta: hide a git error message we don't care about - - fatal: path 'src/tool_listhelp.c' exists on disk, but not in [tag] - -- [Patrick Monnerat brought this change] - - sasl: binary messages - - Capabilities of sasl module are extended to exchange messages in binary - as an alternative to base64. - - If http authentication flags have been set, those are used as sasl - default preferred mechanisms. - - Closes #6930 - -- [Hayden Roche brought this change] - - wolfssl: use for SHA256, MD4, MD5, and setting DES odd parity - - Prior to this commit, OpenSSL could be used for all these functions, but - not wolfSSL. This commit makes it so wolfSSL will be used if USE_WOLFSSL - is defined. - - Closes #7806 - -- scripts/delta: count command line options in the new file - - ... which makes the shown delta number wrong until next release. - -- RELEASE-NOTES: synced - -- print_category: print help descriptions aligned - - Adjust the description position to make an aligned column when doing - help listings, which is more pleasing to the eye. - - Suggested-by: Gisle Vanem - Closes #7792 - -- lib/mk-ca-bundle.pl: skip certs passed Not Valid After date - - With this change applied, the now expired 'DST Root CA X3' cert will no - longer be included in the output. - - Details: https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/ - - Closes #7801 - -- tool_listhelp: easier to generate with gen.pl - - tool_listhelp.c is now a separate file with only the command line --help - output, exactly as generated by gen.pl. This makes it easier to generate - updates according to what's in the docs/cmdline-opts docs. - - cd $srcroot/docs/cmdline-opts - ./gen.pl listhelp *.d > $srcroot/src/tool_listhelp.c - - With a configure build, this also works: - - make -C src listhelp - - Closes #7787 - -- [Anthony Hu brought this change] - - wolfssl: allow setting of groups/curves - - In particular, the quantum safe KEM and hybrid curves if wolfSSL is - built to support them. - - Closes #7728 - -- [Jan Mazur brought this change] - - connnect: use sysaddr_un fron sys/un.h or custom-defined for windows - - Closes #7737 - -Jay Satiro (30 Sep 2021) -- [Rikard Falkeborn brought this change] - - hostip: Move allocation to clarify there is no memleak - - By just glancing at the code, it looks like there is a memleak if the - call to Curl_inet_pton() fails. Looking closer, it is clear that the - call to Curl_inet_pton() can not fail, so the code will never leak - memory. However, we can make this obvious by moving the allocation - after the if-statement. - - Closes https://github.com/curl/curl/pull/7796 - -Daniel Stenberg (30 Sep 2021) -- gen.pl: make the output date format work better - - Follow-up to 15910dfd143dd - - The previous strftime format used didn't work correctly on Windows, so - change to %B %d %Y which today looks like "September 29 2021". - - Reported-by: Gisle Vanem - Bug: #7782 - Closes #7793 - -- typecheck-gcc.h: add CURLOPT_PREREQDATA awareness - - Follow-up to a517378de58358a - - To make test 1912 happy again - - Closes #7799 - -Marcel Raad (29 Sep 2021) -- configure: remove `HAVE_WINSOCK_H` definition - - It's not used anymore. - - Closes https://github.com/curl/curl/pull/7795 - -- CMake: remove `HAVE_WINSOCK_H` definition - - It's not used anymore. - - Closes https://github.com/curl/curl/pull/7795 - -- config: remove `HAVE_WINSOCK_H` definition - - It's not used anymore. - - Closes https://github.com/curl/curl/pull/7795 - -- lib: remove `HAVE_WINSOCK_H` usage - - WinSock v1 is not supported anymore. Exclusively use `HAVE_WINSOCK2_H` - instead. - - Closes https://github.com/curl/curl/pull/7795 - -Daniel Stenberg (29 Sep 2021) -- easyoptions: add the two new PRE* options - - Follow-up to a517378de58358a - - Also fix optiontable.pl to do the correct remainder on the entry. - - Reported-by: Gisle Vanem - Bug: https://github.com/curl/curl/commit/a517378de58358a85b7cfe9efecb56051268f629#commitcomment-57224830 - Closes #7791 - -- Revert "build: remove checks for WinSock 1" - - Due to CI issues - - This reverts commit c2ea04f92b00b6271627cb218647527b5a50f2fc. - - Closes #7790 - -Daniel Gustafsson (29 Sep 2021) -- lib: avoid fallthrough cases in switch statements - - Commit b5a434f7f0ee4d64857f8592eced5b9007d83620 inhibits the warning - on implicit fallthrough cases, since the current coding of indicating - fallthrough with comments is falling out of fashion with new compilers. - This attempts to make the issue smaller by rewriting fallthroughs to no - longer fallthrough, via either breaking the cases or turning switch - statements into if statements. - - lib/content_encoding.c: the fallthrough codepath is simply copied - into the case as it's a single line. - lib/http_ntlm.c: the fallthrough case skips a state in the state- - machine and fast-forwards to NTLMSTATE_LAST. Do this before the - switch statement instead to set up the states that we actually - want. - lib/http_proxy.c: the fallthrough is just falling into exiting the - switch statement which can be done easily enough in the case. - lib/mime.c: switch statement rewritten as if statement. - lib/pop3.c: the fallthrough case skips to the next state in the - statemachine, do this explicitly instead. - lib/urlapi.c: switch statement rewritten as if statement. - lib/vssh/wolfssh.c: the fallthrough cases fast-forwards the state - machine, do this by running another iteration of the switch - statement instead. - lib/vtls/gtls.c: switch statement rewritten as if statement. - lib/vtls/nss.c: the fallthrough codepath is simply copied into the - case as it's a single line. Also twiddle a comment to not be - inside a non-brace if statement. - - Closes: #7322 - See-also: #7295 - Reviewed-by: Daniel Stenberg <daniel@haxx.se> - -Marcel Raad (28 Sep 2021) -- config-win32ce: enable WinSock 2 - - WinSock 2.2 is supported by Windows CE .NET 4.1 (from 2002, out of - support since 2013). - - Ref: https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms899586(v=msdn.10) - - Closes https://github.com/curl/curl/pull/7778 - -- externalsocket: use WinSock 2.2 - - That's the only version we support. - - Closes https://github.com/curl/curl/pull/7778 - -- build: remove checks for WinSock 1 - - It's not supported anymore. - - Closes https://github.com/curl/curl/pull/7778 - -Daniel Stenberg (28 Sep 2021) -- scripts/copyright: .muse is .lift now - - And update 5 files with old copyright year range - -- cmdline-opts: made the 'Added:' field mandatory - - Since "too old" versions are no longer included in the generated man - page, this field is now mandatory so that it won't be forgotten and then - not included in the documentation. - - Closes #7786 - -- curl.1: remove mentions of really old version changes - - To make the man page more readable, this change removes all references - to changes in support/versions etc that happened before 7.30.0 from the - curl.1 output file. 7.30.0 was released on Apr 12 2013. This particular - limit is a bit arbitrary but was fairly easy to grep for. - - It is handled like this: the 'Added' keyword is only used in output if - it refers to 7.30.0 or later. All occurances of "(Added in $VERSION)" in - description will be stripped out if the mentioned $VERSION is from - before 7.30.0. It is therefore important that the "Added in..." - references are always written exactly like that - and on a single line, - not split over two. - - This change removes about 80 version number references from curl.1, down - to 138 from 218. - - Closes #7786 - -- RELEASE-NOTES: synced - -- tool_cb_prg: make resumed upload progress bar show better - - This is a regression that was *probably* injected in the larger progress - bar overhaul in 2018. - - Reported-by: beslick5 on github - Fixes #7760 - Closes #7777 - -- gen.pl: insert the current date and version in generated man page - - Reported-by: Gisle Vanem - Ref: #7780 - Closes #7782 - -- NTLM: use DES_set_key_unchecked with OpenSSL - - ... as the previously used function DES_set_key() will in some cases - reject using a key that it deems "weak" which will cause curl to - continue using the unitialized buffer content as key instead. - - Assisted-by: Harry Sintonen - Fixes #7779 - Closes #7781 - -Marc Hoersken (27 Sep 2021) -- CI: align make and test flags in various config files - - 1. Use Makefile target to run tests in autotools builds on AppVeyor. - 2. Disable testing of SCP protocol on native Windows environments. - 3. Remove redundant parameters -a -p from target test-nonflaky. - 4. Don't use -vc parameter which is reserved for debugging. - - Replaces #7591 - Closes #7690 - -Daniel Stenberg (27 Sep 2021) -- mailmap: unify Max! - -- [Max Dymond brought this change] - - CURLOPT_PREREQFUNCTION: add new callback - - Triggered before a request is made but after a connection is set up - - Changes: - - - callback: Update docs and callback for pre-request callback - - Add documentation for CURLOPT_PREREQDATA and CURLOPT_PREREQFUNCTION, - - Add redirect test and callback failure test - - Note that the function may be called multiple times on a redirection - - Disable new 2086 test due to Windows weirdness - - Closes #7477 - -- KNOWN_BUGS: HTTP/2 connections through HTTPS proxy frequently stall - - Closes #6936 - -- TODO: make configure use --cache-file more and better - - Closes #7753 - -- [Sergey Markelov brought this change] - - urlapi: support UNC paths in file: URLs on Windows - - - file://host.name/path/file.txt is a valid UNC path - \\host.name\path\files.txt to a non-local file transformed into URI - (RFC 8089 Appendix E.3) - - - UNC paths on other OSs must be smb: URLs - - Closes #7366 - -- [Gleb Ivanovsky brought this change] - - urlapi: add curl_url_strerror() - - Add curl_url_strerror() to convert CURLUcode into readable string and - facilitate easier troubleshooting in programs using URL API. - Extend CURLUcode with CURLU_LAST for iteration in unit tests. - Update man pages with a mention of new function. - Update example code and tests with new functionality where it fits. - - Closes #7605 - -- RELEASE-NOTES: synced - -- [Mats Lindestam brought this change] - - libssh2: add SHA256 fingerprint support - - Added support for SHA256 fingerprint in command line curl and in - libcurl. - - Closes #7646 - -- libcurl.rc: switch out the copyright symbol for plain ASCII - - Reported-by: Vitaly Varyvdin - Assisted-by: Viktor Szakats - Fixes #7765 - Closes #7776 - -- [Jun-ya Kato brought this change] - - ngtcp2: fix QUIC transport parameter version - - fix inappropriate version setting for QUIC transport parameters. - this patch keeps curl with ngtcp2 uses QUIC draft version (h3-29). - - Closes #7771 - -- examples/imap-append: fix end-of-data check - - Reported-by: Alexander Chuykov - Fixes #7774 - Closes #7775 - -Michael Kaufmann (24 Sep 2021) -- vtls: Fix a memory leak if an SSL session cannot be added to the cache - - On connection shutdown, a new TLS session ticket may arrive after the - SSL session cache has already been destructed. In this case, the new - SSL session cannot be added to the SSL session cache. - - The callers of Curl_ssl_addsessionid() need to know whether the SSL - session has been added to the cache. If it has not been added, the - reference counter of the SSL session must not be incremented, or memory - used by the SSL session must be freed. This is now possible with the new - output parameter "added" of Curl_ssl_addsessionid(). - - Fixes #7683 - Closes #7752 - -Daniel Stenberg (24 Sep 2021) -- [Momoka Yamamoto brought this change] - - HTTP3.md: use 'autoreconf -fi' instead of buildconf - - buildconf is not used since #5853 - - Closes #7746 - -- GIT-INFO: rephrase to adapt to s/buildconf/autoreconf - -- [h1zzz brought this change] - - llist: remove redundant code, branch will not be executed - - Closes #7770 - -- [tlahn brought this change] - - HTTP-COOKIES.md: remove duplicate 'each' - - Closes #7772 - -Jay Satiro (24 Sep 2021) -- [Joel Depooter brought this change] - - libssh2: Get the version at runtime if possible - - Previously this code used a compile time constant, meaning that libcurl - always reported the libssh2 version that libcurl was built with. This - could differ from the libssh2 version actually being used. The new code - uses the CURL_LIBSSH2_VERSION macro, which is defined in ssh.h. The - macro calls the libssh2_version function if it is available, otherwise - it falls back to the compile time version. - - Closes https://github.com/curl/curl/pull/7768 - -- [Joel Depooter brought this change] - - schannel: fix typo - - Closes https://github.com/curl/curl/pull/7769 - -Daniel Stenberg (23 Sep 2021) -- cmake: with OpenSSL, define OPENSSL_SUPPRESS_DEPRECATED - - To avoid the "... is deprecated" warnings brought by OpenSSL v3. - (We need to address the underlying code at some point of course.) - - Assisted-by: Jakub Zakrzewski - Closes #7767 - -- curl-openssl: pass argument to sed single-quoted - - ... instead of using an escaped double-quote. This is an attempt to make - this work better with ksh that otherwise would insist on a double - escape! - - Reported-by: Randall S. Becker - Fixes #7758 - Closes #7764 - -- RELEASE-NOTES: synced - - Bumped curlver to 7.80.0-dev - -- [a1346054 brought this change] - - misc: fix typos in docs and comments - - No user facing output from curl/libcurl is changed by this, just - comments. - - Closes #7747 - -- [Thomas M. DuBuisson brought this change] - - ci: update Lift config to match requirements of curl build - - Also renamed Muse -> Lift, the new tool name. - - Closes #7761 - -- [Rikard Falkeborn brought this change] - - cleanup: constify unmodified static structs - - Constify a number of static structs that are never modified. Make them - const to show this. - - Closes #7759 - -Version 7.79.1 (22 Sep 2021) - -Daniel Stenberg (22 Sep 2021) -- RELEASE-NOTES: synced - - curl 7.79.1 release - -- THANKS: added names from the 7.79.1 release - -- test897: verify delivery of IMAP post-body header content - - The "content" is delivered as "body" by curl, but the envelope continues - after the body and the rest of it should be delivered as header. - - The IMAP server can now get 'POSTFETCH' set to include more data to - include after the body and test 897 is done to verify that such "extra" - header data is in fact delivered by curl as header. - - Ref: #7284 but fails to reproduce the issue - - Closes #7748 - -- KNOWN_BUGS: connection migration doesn't work - - Closes #7695 - -- RELEASE-NOTES: synced - -- http: fix the broken >3 digit response code detection - - When the "reason phrase" in the HTTP status line starts with a digit, - that was treated as the forth response code digit and curl would claim - the response to be non-compliant. - - Added test 1466 to verify this case. - - Regression brought by 5dc594e44f73b17 - Reported-by: Glenn de boer - Fixes #7738 - Closes #7739 - -Jay Satiro (17 Sep 2021) -- strerror: use sys_errlist instead of strerror on Windows - - - Change Curl_strerror to use sys_errlist[errnum] instead of strerror to - retrieve the error message on Windows. - - Windows' strerror writes to a static buffer and is not thread-safe. - - Follow-up to 2f0bb86 which removed most instances of strerror in favor - of calling Curl_strerror (which calls strerror_r for other platforms). - - Ref: https://github.com/curl/curl/pull/7685 - Ref: https://github.com/curl/curl/commit/2f0bb86 - - Closes https://github.com/curl/curl/pull/7735 - -Daniel Stenberg (16 Sep 2021) -- dist: provide lib/.checksrc in the tarball - - So that debug builds work (checksrc really) - - Reported-by: Marcel Raad - Reported-by: tawmoto on github - Fixes #7733 - Closes #7734 - -- TODO: Improve documentation about fork safety - - Closes #6968 - -- hsts: CURLSTS_FAIL from hsts read callback should fail transfer - - ... and have CURLE_ABORTED_BY_CALLBACK returned. - - Extended test 1915 to verify. - - Reported-by: Jonathan Cardoso - Fixes #7726 - Closes #7729 - -- test1184: disable - - The test should be fine and it works for me repeated when run manually, - but clearly it causes CI failures and it needs more research. - - Reported-by: RiderALT on github - Fixes #7725 - Closes #7732 - -- Curl_http2_setup: don't change connection data on repeat invokes - - Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved - transfer oriented inits to before the check but also erroneously moved a - few connection oriented ones, which causes problems. - - Reported-by: Evangelos Foutras - Fixes #7730 - Closes #7731 - -- RELEASE-NOTES: synced - - and bump to 7.79.1 - -Kamil Dudka (16 Sep 2021) -- tests/sshserver.pl: make it work with openssh-8.7p1 - - ... by not using options with no argument where an argument is required: - - === Start of file tests/log/ssh_server.log - curl_sshd_config line 6: no argument after keyword "DenyGroups" - curl_sshd_config line 7: no argument after keyword "AllowGroups" - curl_sshd_config line 10: Deprecated option AuthorizedKeysFile2 - curl_sshd_config line 29: Deprecated option KeyRegenerationInterval - curl_sshd_config line 39: Deprecated option RhostsRSAAuthentication - curl_sshd_config line 40: Deprecated option RSAAuthentication - curl_sshd_config line 41: Deprecated option ServerKeyBits - curl_sshd_config line 45: Deprecated option UseLogin - curl_sshd_config line 56: no argument after keyword "AcceptEnv" - curl_sshd_config: terminating, 3 bad configuration options - === End of file tests/log/ssh_server.log - - === Start of file log/sftp_server.log - curl_sftp_config line 33: Unsupported option "rhostsrsaauthentication" - curl_sftp_config line 34: Unsupported option "rsaauthentication" - curl_sftp_config line 52: no argument after keyword "sendenv" - curl_sftp_config: terminating, 1 bad configuration options - Connection closed. - Connection closed - === End of file log/sftp_server.log - - Closes #7724 - -Daniel Stenberg (15 Sep 2021) -- hsts: handle unlimited expiry - - When setting a blank expire string, meaning unlimited, curl would pass - TIME_T_MAX to getime_r() when creating the output, while on 64 bit - systems such a large value cannot be convetered to a tm struct making - curl to exit the loop with an error instead. It can't be converted - because the year it would represent doesn't fit in the 'int tm_year' - field! - - Starting now, unlimited expiry is instead handled differently by using a - human readable expiry date spelled out as "unlimited" instead of trying - to use a distant actual date. - - Test 1660 and 1915 have been updated to help verify this change. - - Reported-by: Jonathan Cardoso - Fixes #7720 - Closes #7721 - -- curl_multi_fdset: make FD_SET() not operate on sockets out of range - - The VALID_SOCK() macro was made to only check for FD_SETSIZE if curl was - built to use select(), even though the curl_multi_fdset() function - always and unconditionally uses FD_SET and needs the check. - - Reported-by: 0xee on github - Fixes #7718 - Closes #7719 - -- FAQ: add GOPHERS + curl works on data, not files - -Version 7.79.0 (14 Sep 2021) - -Daniel Stenberg (14 Sep 2021) -- RELEASE-NOTES: synced - - For the 7.79.0 release - -- THANKS: add contributors from 7.79.0 release cycle - -- FAQ: add two dev related questions - - 8.1 Why does curl use C89? - 8.2 Will curl be rewritten? - - Spell-checked-by: Paul Johnson - Closes #7715 - -- zuul.d/jobs: disable three tests for *-openssl-disable-proxy - - ... as they mysteriously seem to permfail without being related to - proxy. - - Closes #7714 - -- [Patrick Monnerat brought this change] - - ftp,imap,pop3,smtp: reject STARTTLS server response pipelining - - If a server pipelines future responses within the STARTTLS response, the - former are preserved in the pingpong cache across TLS negotiation and - used as responses to the encrypted commands. - - This fix detects pipelined STARTTLS responses and rejects them with an - error. - - CVE-2021-22947 - - Bug: https://curl.se/docs/CVE-2021-22947.html - -- [Patrick Monnerat brought this change] - - ftp,imap,pop3: do not ignore --ssl-reqd - - In imap and pop3, check if TLS is required even when capabilities - request has failed. - - In ftp, ignore preauthentication (230 status of server greeting) if TLS - is required. - - Bug: https://curl.se/docs/CVE-2021-22946.html - - CVE-2021-22946 - -- [z2_ on hackerone brought this change] - - mqtt: clear the leftovers pointer when sending succeeds - - CVE-2021-22945 - - Bug: https://curl.se/docs/CVE-2021-22945.html - -- zuul: bump the rustls job to use v0.7.2 - - ... and add -lm when using a rust library. - - Closes #7701 - -- RELEASE-PROCEDURE: add release dates from now to 8.0.0 in 2023 - -- SECURITY-PROCESS: tweak a little to match current practices - - Closes #7713 - -- http_proxy: fix the User-Agent inclusion in CONNECT - - It should not refer to the uagent string that is allocated and created - for the end server http request, as that pointer may be cleared on - subsequent CONNECT requests. - - Added test case 1184 to verify. - - Reported-by: T200proX7 on github - Fixes #7705 - Closes #7707 - -- Curl_hsts_loadcb: don't attempt to load if hsts wasn't inited - - Reported-by: Jonathan Cardoso - Fixes #7710 - Closes #7711 - -- [Tatsuhiro Tsujikawa brought this change] - - ngtcp2: fix build with ngtcp2 and nghttp3 - - ngtcp2_conn_client_new and nghttp3_conn_client_new are now macros. - Check the wrapped functions instead. - - ngtcp2_stream_close callback now takes flags parameter. - - Closes #7709 - -- write-out.d: clarify size_download/upload - - They show the number of "body" bytes transfered. - Fixes #7702 - Closes #7706 - -- http2: Curl_http2_setup needs to init stream data in all invokes - - Thus function was written to avoid doing multiple connection data - initializations, which is fine, but since it also initiates stream - related data it is crucial that it doesn't skip those even if called - again for the same connection. Solved by moving the stream - initializations before the "doing-it-again" check. - - Reported-by: Inho Oh - Fixes #7630 - Closes #7692 - -- url: fix compiler warning in no-verbose builds - - Follow-up from 2f0bb864c12 - - Closes #7700 - -- non-ascii: fix build errors from strerror fix - - Follow-up to 2f0bb864c12 - - Closes #7697 - -- parse_args: redo the warnings for --remote-header-name combos - - ... to avoid the memory leak risk pointed out by scan-build. - - Follow-up from 7a3e981781d6c18a - - Closes #7698 - -- ngtcp2: adapt to new size defintions upstream - - Reviewed-by: Tatsuhiro Tsujikawa - Closes #7699 - -- rustls: add strerror.h include - - Follow-up to 2f0bb864c12 - -- docs: the security list is reached at security at curl.se now - - Also update the FAQ section a bit to encourage users to rather submit - security issues on hackerone than sending email. - - Closes #7689 - -Marc Hoersken (9 Sep 2021) -- runtests: add option -u to error on server unexpectedly alive - - Let's try to actually handle the server unexpectedly alive - case by first making them visible on CI builds as failures. - - This is needed to detect issues with killing of the test - servers completely including nested process chains with - multiple PIDs per test server (including bash and perl). - - On Windows/cygwin platforms this is especially helpful with - debugging PID mixups due to cygwin using its own PID space. - - Reviewed-by: Daniel Stenberg - Closes #7180 - -Daniel Stenberg (9 Sep 2021) -- opts docs: unify phrasing in NAME header - - - avoid writing "set ..." or "enable/disable ..." or "specify ..." - *All* options for curl_easy_setopt() are about setting or enabling - things and most of the existing options didn't use that way of - description. - - - start with lowercase letter, unless abbreviation. For consistency. - - - Some additional touch-ups - - Closes #7688 - -- strerror.h: remove the #include from files not using it - -- lib: don't use strerror() - - We have and provide Curl_strerror() internally for a reason: strerror() - is not necessarily thread-safe so we should always try to avoid it. - - Extended checksrc to warn for this, but feature the check disabled by - default and only enable it in lib/ - - Closes #7685 - -Daniel Gustafsson (8 Sep 2021) -- cirrus: Add FreeBSD 13.0 job and disable sanitizer build - - As alluded to the in the now removed comment, a 13.0 image became - available and is now ready to be used. - - The sanitizer builds were running on the 12.1 image which since has - been removed from the config, leaving the builds not running at all. - When enabled it turns out that they don't actually work due to very - long timeouts in executing the tests, so keep the disabled for now - but a bit more controlled. - - Closes #7592 - -Daniel Stenberg (8 Sep 2021) -- copyrights: update copyright year ranges - -- RELEASE-NOTES: synced - -- INTERNALS: c-ares has a new home: c-ares.org - -- docs: remove experimental mentions from HSTS and MQTT - - Reported-by: Jonathan Cardoso - Bug: https://github.com/curl/curl/pull/6700#issuecomment-913792863 - Closes #7681 - -- [Cao ZhenXiang brought this change] - - curl: add warning for incompatible parameters usage - - --continue-at - and --remote-header-name are known incompatible parameters - - Closes #7674 - -- [git-bruh brought this change] - - examples/*hiperfifo.c: fix calloc arguments to match function proto - - Closes #7678 - -- INTERNALS: bump c-ares requirement to 1.16.0 - - Since ba904db0705c93 we use ares_getaddrinfo, added in c-ares 1.16.0 - -- curl: stop retry if Retry-After: is longer than allowed - - If Retry-After: specifies a period that is longer than what fits within - --retry-max-time, then stop retrying immediately. - - Added test 366 to verify. - - Reported-by: Kari Pahula - Fixes #7675 - Closes #7676 - -- [Michał Antoniak brought this change] - - mbedtls: avoid using a large buffer on the stack - - Use dynamic memory allocation for the buffer used in checking "pinned - public key". The PUB_DER_MAX_BYTES parameter with default settings is - set to a value greater than 2kB. - - Co-authored-by: Daniel Stenberg - Closes #7586 - -- configure: make --disable-hsts work - - The AC_ARG_ENABLE() macro itself uses a variable called - 'enable_[option]', so when our script also used a variable with that - name for the purpose of storing what the user wants, it also - accidentally made it impossible to switch off the feature with - --disable-hsts. Fix this by renaming our variable. - - Reported-by: Michał Antoniak - Fixes #7669 - Closes #7672 - -Jay Satiro (5 Sep 2021) -- config.d: note that curlrc is used even when --config - - Bug: https://github.com/curl/curl/pull/7666#issuecomment-912214751 - Reported-by: Viktor Szakats - - Closes https://github.com/curl/curl/pull/7667 - -Daniel Stenberg (4 Sep 2021) -- RELEASE-NOTES: synced - -- test1173: check references to libcurl options - - ... that they refer to actual existing libcurl options. - - Reviewed-by: Daniel Gustafsson - Closes #7656 - -- CURLOPT_UNIX_SOCKET_PATH.3: remove nginx reference, add see also - - Closes #7656 - -- opt-docs: verify man page sections + order - - In every libcurl option man page there are now 8 mandatory sections that - must use the right name in the correct order and test 1173 verifies - this. Only 14 man pages needed adjustments. - - The sections and the order is as follows: - - - NAME - - SYNOPSIS - - DESCRIPTION - - PROTOCOLS - - EXAMPLE - - AVAILABILITY - - RETURN VALUE - - SEE ALSO - - Reviewed-by: Daniel Gustafsson - Closes #7656 - -- opt-docs: make sure all man pages have examples - - Extended manpage-syntax.pl (run by test 1173) to check that every man - page for a libcurl option has an EXAMPLE section that is more than two - lines. Then fixed all errors it found and added examples. - - Reviewed-by: Daniel Gustafsson - Closes #7656 - -- get.d: provide more useful examples - - Closes #7668 - -- page-header: add GOPHERS, simplify wording in the 1st para - - Closes #7665 - -- connect: get local port + ip also when reusing connections - - Regression. In d6a37c23a3c (7.75.0) we removed the duplicated storage - (connection + easy handle), so this info needs be extracted again even - for re-used connections. - - Add test 435 to verify - - Reported-by: Max Dymond - Fixes #7660 - Closes #7662 - -Marcel Raad (2 Sep 2021) -- multi: fix compiler warning with `CURL_DISABLE_WAKEUP` - - `use_wakeup` is unused in this case. - - Closes https://github.com/curl/curl/pull/7661 - -Daniel Stenberg (1 Sep 2021) -- tests: adjust the tftpd output to work with hyper mode - - By making them look less like http headers, the hyper mode "tweak" - doesn't interfere. - - Enable test 2002 and 2003 in hyper builds (and 1280 which is unrelated - but should be enabled). - - Closes #7658 - -Daniel Gustafsson (1 Sep 2021) -- [Gisle Vanem brought this change] - - openssl: annotate SSL3_MT_SUPPLEMENTAL_DATA - - This adds support for the previously unhandled supplemental data which - in -v output was printed like: - - TLSv1.2 (IN), TLS header, Unknown (23): - - These will now be printed with proper annotation: - - TLSv1.2 (OUT), TLS header, Supplemental data (23): - - Closes #7652 - Reviewed-by: Daniel Stenberg <daniel@haxx.se> - -Daniel Stenberg (1 Sep 2021) -- curl.1: provide examples for each option - - The file format for each option now features a "Example:" header that - can provide one or more examples that get rendered appropriately in the - output. All options MUST have at least one example or gen.pl complains - at build-time. - - This fix also does a few other minor format and consistency cleanups. - - Closes #7654 - -- progress: make trspeed avoid floats - - and compiler warnings for data conversions. - - Reported-by: Michał Antoniak - Fixes #7645 - Closes #7653 - -- test365: verify response with chunked AND Content-Length headers - -- http: ignore content-length if any transfer-encoding is used - - Fixes #7643 - Closes #7649 - -- RELEASE-NOTES: synced - -- Revert "http2: skip immediate parsing of payload following protocol switch" - - This reverts commit 455a63c66f188598275e87d32de2c4e8e26b80cb. - - Reported-by: Tk Xiong - Fixes #7633 - Closes #7648 - -- KNOWN_BUGS: HTTP/3 doesn't support client certs - - Closes #7625 - -- mailing lists: move from cool.haxx.se to lists.haxx.se - -- http_proxy: only wait for writable socket while sending request - - Otherwise it would wait socket writability even after the entire CONNECT - request has sent and make curl basically busy-loop while waiting for a - response to come back. - - The previous fix attempt in #7484 (c27a70a591a4) was inadequate. - - Reported-by: zloi-user on github - Reported-by: Oleguer Llopart - Fixes #7589 - Closes #7647 - -- http: disallow >3-digit response codes - - Make the built-in HTTP parser behave similar to hyper and reject any - HTTP response using more than 3 digits for the response code. - - Updated test 1432 accordingly. - Enabled test 1432 in the hyper builds. - - Closes #7641 - -- [Tatsuhiro Tsujikawa brought this change] - - ngtcp2: stop buffering crypto data - - Stop buffering crypto data because libngtcp2 now buffers submitted - crypto data. - - Closes #7637 - -- test1280: CRLFify the response to please hyper - - Closes #7639 - -- tests: enable test 1129 for hyper builds - - Closes #7638 - -- curl: better error message when -O fails to get a good name - - Due to how this currently works internally, it needs a working initial - file name to store contents in, so it may still fail even with -J is - used (and thus accepting a name from content-disposition:) if the file - name part of the URL isn't "good enough". - - Fixes #7628 - Closes #7635 - -- curl_easy_setopt: tweak the string copy wording - - Reported-by: Yaobin Wen - Fixes #7632 - Closes #7634 - -- RELEASE-NOTES: synced - -- [Don J Olmstead brought this change] - - cmake: sync CURL_DISABLE options - - Adds the full listing of CURL_DISABLE options to the CMake build. Moves - all option code, except for CURL_DISABLE_OPENSSL_AUTO_LOA_CONFIG which - resides near OpenSSL configuration, to the same block of code. Also - sorts the options here and in the cmake config header. - - Additionally sorted the CURL-DISABLE listing and fixed the - CURL_DISABLE_POP3 option. - - Closes #7624 - -Jay Satiro (25 Aug 2021) -- KNOWN_BUGS: FTPS upload data loss with TLS 1.3 - - Bug: https://github.com/curl/curl/issues/6149 - Reported-by: Bylon2@users.noreply.github.com - - Closes https://github.com/curl/curl/pull/7623 - -Daniel Stenberg (24 Aug 2021) -- cmake: avoid poll() on macOS - - ... like we do in configure builds. Since poll() on macOS is not - reliable enough. - - Reported-by: marc-groundctl - Fixes #7595 - Closes #7619 - -- c-hyper: handle HTTP/1.1 => HTTP/1.0 downgrade on reused connection - - Enable test 1074 - - Closes #7617 - -- c-hyper: deal with Expect: 100-continue combined with POSTFIELDS - - Enable test 1130 and 1131 - - Closes #7616 - -- [a1346054 brought this change] - - tests: be explicit about using 'python3' instead of 'python' - - This fixes running tests in virtualenvs (or on distros) that no longer - have a symlink from python to python2 or python3. - - Closes #7602 - -- [a1346054 brought this change] - - scripts: invoke interpreters through /usr/bin/env - - Closes #7602 - -- DISABLED: enable 11 more tests for hyper builds - - Closes #7612 - -- setopt: enable CURLOPT_IGNORE_CONTENT_LENGTH for hyper - - Since this option is also used for FTP, it needs to work to set for - applications even if hyper doesn't support it for HTTP. Verified by test - 1137. - - Updated docs to specify that the option doesn't work for HTTP when using - the hyper backend. - - Closes #7614 - -- test1138: remove trailing space to make work with hyper - - Closes #7613 - -- libcurl-errors.3: clarify two CURLUcode errors - - CURLUE_BAD_HANDLE and CURLUE_BAD_PARTPOINTER should be for "bad" or - wrong pointers in a generic sense, not just for NULL pointers. - - Reviewed-by: Jay Satiro - - Ref: #7605 - Closes #7611 - -Jay Satiro (23 Aug 2021) -- symbols-in-versions: fix CURLSSLBACKEND_QSOSSL last used version - - ... and also change the 'Removed' column name to 'Last' since that - column is for the last version to contain the symbol. - - Closes https://github.com/curl/curl/pull/7609 - -Daniel Stenberg (23 Aug 2021) -- urlapi.c:seturl: assert URL instead of using if-check - - There's no code flow possible where this can happen. The assert makes - sure it also won't be introduced undetected in the future. - - Closes #7610 - -- curl-openssl.m4: show correct output for OpenSSL v3 - - Using 3.0.0 versions configure should now show this: - - checking for OpenSSL headers version... 3.0.0 - 0x300 - checking for OpenSSL library version... 3.0.0 - checking for OpenSSL headers and library versions matching... yes - - This output doesn't actually change what configure generates but is only - "cosmetic". - - Reported-by: Randall S. Becker - Fixes #7606 - Closes #7608 + Closes #7889 diff --git a/libs/libcurl/docs/THANKS b/libs/libcurl/docs/THANKS index e3a2ff5867..b9f6eee256 100644 --- a/libs/libcurl/docs/THANKS +++ b/libs/libcurl/docs/THANKS @@ -374,6 +374,7 @@ Caolan McNamara Captain Basil Carie Pointer Carl Zogheib +Carlo Alberto Carlo Cannas Carlo Marcelo Arenas Belón Carlo Teubner @@ -699,6 +700,7 @@ Edward Thomson Eelco Dolstra Eetu Ojanen Egon Eckert +Egor Pugin Ehren Bendler Eldar Zaitov elelel on github @@ -708,6 +710,7 @@ Elia Tufarolo Elliot Saba Ellis Pritchard Elmira A Semenova +Elms elsamuko on github emanruse on github Emanuele Bovisio @@ -817,6 +820,7 @@ Frank Van Uffelen František Kučera François Charlier François Rigault +Frazer Smith Fred Machado Fred New Fred Noz @@ -997,6 +1001,7 @@ illusory-dream on github Ilya Kosarev imilli on github Immanuel Gregoire +ImpatientHippo on GitHub Inca R infinnovation-dev on github Ingmar Runge @@ -1028,6 +1033,7 @@ Jactry Zeng Jad Chamcham Jaime Fullaondo jakirkham on github +Jakub Bochenski Jakub Wilk Jakub Zakrzewski James Atwill @@ -1304,6 +1310,7 @@ Kantanat Wannapaka Kari Pahula Karl Chen Karl Moerder +Karlson2k on github Karol Pietrzak Kartik Mahajan Kaspar Brand @@ -1351,6 +1358,7 @@ Koichi Shiraishi kokke on github Konstantin Isakov Konstantin Kushnir +KotlinIsland on github kotoriのねこ kouzhudong on github Kovalkov Dmitrii @@ -1510,6 +1518,7 @@ Marcos Diazr Marcus Hoffmann Marcus Klein Marcus Sundberg +Marcus T Marcus Webster Marian Klymov Mario Schroeder @@ -1603,6 +1612,7 @@ Max Dymond Max Katsev Max Kellermann Max Khon +Max Mehl Max Peal Max Savenkov Max Zettlmeißl @@ -1797,6 +1807,7 @@ Norbert Kett Norbert Novotny nosajsnikta on github NTMan on Github +Nuru on github Octavio Schroeder Ofer Okhin Vasilij @@ -1953,6 +1964,7 @@ Pierre Joye Pierre Yager Pierre Ynard Pierre-Yves Bigourdan +Pierrick Charron Piotr Dobrogost Piotr Komborski Po-Chuan Hsieh @@ -2031,6 +2043,7 @@ Reza Arbab Rianov Viacheslav Ricardo Cadime Ricardo Gomes +Ricardo M. Correia Ricardo Martins Rich Burridge Rich FitzJohn @@ -2221,6 +2234,7 @@ Serj Kalichev Seshubabu Pasam Seth Mos Sevan Janiyan +Sgharat on github Sh Diao Shachaf Ben-Kiki Shailesh Kapse @@ -2243,6 +2257,7 @@ siddharthchhabrap on github Sidney San Martín Siegfried Gyuricsko silveja1 on github +Simon Berger Simon Chalifoux Simon Dick Simon H. @@ -2369,6 +2384,7 @@ Thomas Braun Thomas Danielsson Thomas Gamper Thomas Glanzmann +Thomas Guillem Thomas J. Moore Thomas Klausner Thomas L. Shinnick @@ -2429,6 +2445,7 @@ Todd Short Todd Vierling Tom Benoist Tom Donovan +Tom Eccles Tom G. Christensen Tom Grace Tom Greenslade @@ -2537,6 +2554,7 @@ Vojtěch Král Volker Schmid Vsevolod Novikov vshmuk on hackerone +vvb2060 on github Vyron Tsingaras W. Mark Kubacki Waldek Kozba @@ -2557,6 +2575,7 @@ Wham Bang Wilfredo Sanchez Will Dietz Will Roberts +Willem Hoek Willem Sparreboom William A. Rowe Jr William Ahern @@ -2564,6 +2583,7 @@ William Desportes wmsch on github wncboy on github Wojciech Zwiefka +Wolf Vollprecht Wouter Van Rooy Wu Yongzheng Wyatt O'Day diff --git a/libs/libcurl/include/README.md b/libs/libcurl/include/README.md index bd28a30e85..8fdbe0e0e9 100644 --- a/libs/libcurl/include/README.md +++ b/libs/libcurl/include/README.md @@ -1,3 +1,9 @@ +<!-- +Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, et al. + +SPDX-License-Identifier: curl +--> + # include Public include files for libcurl, external users. diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h index 3a2c2ea561..b00648e791 100644 --- a/libs/libcurl/include/curl/curl.h +++ b/libs/libcurl/include/curl/curl.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* @@ -613,6 +615,7 @@ typedef enum { CURLE_QUIC_CONNECT_ERROR, /* 96 - QUIC connection error */ CURLE_PROXY, /* 97 - proxy handshake error */ CURLE_SSL_CLIENTCERT, /* 98 - client-side certificate required */ + CURLE_UNRECOVERABLE_POLL, /* 99 - poll/select returned fatal error */ CURL_LAST /* never use! */ } CURLcode; @@ -855,7 +858,18 @@ typedef int const struct curl_khkey *knownkey, /* known */ const struct curl_khkey *foundkey, /* found */ enum curl_khmatch, /* libcurl's view on the keys */ - void *clientp); /* custom pointer passed from app */ + void *clientp); /* custom pointer passed with */ + /* CURLOPT_SSH_KEYDATA */ + +typedef int + (*curl_sshhostkeycallback) (void *clientp,/* custom pointer passed*/ + /* with CURLOPT_SSH_HOSTKEYDATA */ + int keytype, /* CURLKHTYPE */ + const char *key, /*hostkey to check*/ + size_t keylen); /*length of the key*/ + /*return CURLE_OK to accept*/ + /*or something else to refuse*/ + /* parameter for the CURLOPT_USE_SSL option */ typedef enum { @@ -2122,6 +2136,13 @@ typedef enum { /* Set MIME option flags. */ CURLOPT(CURLOPT_MIME_OPTIONS, CURLOPTTYPE_LONG, 315), + /* set the SSH host key callback, must point to a curl_sshkeycallback + function */ + CURLOPT(CURLOPT_SSH_HOSTKEYFUNCTION, CURLOPTTYPE_FUNCTIONPOINT, 316), + + /* set the SSH host key callback custom pointer */ + CURLOPT(CURLOPT_SSH_HOSTKEYDATA, CURLOPTTYPE_CBPOINT, 317), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; @@ -2589,8 +2610,10 @@ CURL_EXTERN void curl_free(void *p); * * curl_global_init() should be invoked exactly once for each application that * uses libcurl and before any call of other libcurl functions. - * - * This function is not thread-safe! + + * This function is thread-safe if CURL_VERSION_THREADSAFE is set in the + * curl_version_info_data.features flag (fetch by curl_version_info()). + */ CURL_EXTERN CURLcode curl_global_init(long flags); @@ -2799,8 +2822,9 @@ typedef enum { CURLINFO_EFFECTIVE_METHOD = CURLINFO_STRING + 58, CURLINFO_PROXY_ERROR = CURLINFO_LONG + 59, CURLINFO_REFERER = CURLINFO_STRING + 60, - - CURLINFO_LASTONE = 60 + CURLINFO_CAINFO = CURLINFO_STRING + 61, + CURLINFO_CAPATH = CURLINFO_STRING + 62, + CURLINFO_LASTONE = 62 } CURLINFO; /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as @@ -3006,6 +3030,7 @@ typedef struct curl_version_info_data curl_version_info_data; #define CURL_VERSION_UNICODE (1<<27) /* Unicode support on Windows */ #define CURL_VERSION_HSTS (1<<28) /* HSTS is supported */ #define CURL_VERSION_GSASL (1<<29) /* libgsasl is supported */ +#define CURL_VERSION_THREADSAFE (1<<30) /* libcurl API is thread-safe */ /* * NAME curl_version_info() diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h index fdd8e3f8f3..a21446e346 100644 --- a/libs/libcurl/include/curl/curlver.h +++ b/libs/libcurl/include/curl/curlver.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* This header file contains nothing but libcurl version info, generated by @@ -30,13 +32,13 @@ /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "7.83.1" +#define LIBCURL_VERSION "7.84.0" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 83 -#define LIBCURL_VERSION_PATCH 1 +#define LIBCURL_VERSION_MINOR 84 +#define LIBCURL_VERSION_PATCH 0 /* This is the numeric version of the libcurl version number, meant for easier parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will @@ -57,7 +59,7 @@ CURL_VERSION_BITS() macro since curl's own configure script greps for it and needs it to contain the full number. */ -#define LIBCURL_VERSION_NUM 0x075301 +#define LIBCURL_VERSION_NUM 0x075400 /* * This is the date and time when the full source package was created. The @@ -68,7 +70,7 @@ * * "2007-11-23" */ -#define LIBCURL_TIMESTAMP "2022-05-11" +#define LIBCURL_TIMESTAMP "2022-06-27" #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z)) #define CURL_AT_LEAST_VERSION(x,y,z) \ diff --git a/libs/libcurl/include/curl/easy.h b/libs/libcurl/include/curl/easy.h index 2dbfb26b5b..9c7e63adad 100644 --- a/libs/libcurl/include/curl/easy.h +++ b/libs/libcurl/include/curl/easy.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifdef __cplusplus extern "C" { diff --git a/libs/libcurl/include/curl/header.h b/libs/libcurl/include/curl/header.h index 7715b61e22..6af29c0c0a 100644 --- a/libs/libcurl/include/curl/header.h +++ b/libs/libcurl/include/curl/header.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ struct curl_header { diff --git a/libs/libcurl/include/curl/mprintf.h b/libs/libcurl/include/curl/mprintf.h index 3549552dba..cb948dcd97 100644 --- a/libs/libcurl/include/curl/mprintf.h +++ b/libs/libcurl/include/curl/mprintf.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <stdarg.h> diff --git a/libs/libcurl/include/curl/multi.h b/libs/libcurl/include/curl/multi.h index 91cd95d323..30104925b7 100644 --- a/libs/libcurl/include/curl/multi.h +++ b/libs/libcurl/include/curl/multi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* This is an "external" header file. Don't give away any internals here! @@ -75,6 +77,7 @@ typedef enum { CURLM_WAKEUP_FAILURE, /* wakeup is unavailable or failed */ CURLM_BAD_FUNCTION_ARGUMENT, /* function called with a bad parameter */ CURLM_ABORTED_BY_CALLBACK, + CURLM_UNRECOVERABLE_POLL, CURLM_LAST } CURLMcode; diff --git a/libs/libcurl/include/curl/options.h b/libs/libcurl/include/curl/options.h index 91360b3581..c8ac827c07 100644 --- a/libs/libcurl/include/curl/options.h +++ b/libs/libcurl/include/curl/options.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifdef __cplusplus diff --git a/libs/libcurl/include/curl/stdcheaders.h b/libs/libcurl/include/curl/stdcheaders.h index 60596c7568..82e1b5fef6 100644 --- a/libs/libcurl/include/curl/stdcheaders.h +++ b/libs/libcurl/include/curl/stdcheaders.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <sys/types.h> diff --git a/libs/libcurl/include/curl/system.h b/libs/libcurl/include/curl/system.h index 000fea6c75..8d56b8a4a1 100644 --- a/libs/libcurl/include/curl/system.h +++ b/libs/libcurl/include/curl/system.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/include/curl/typecheck-gcc.h b/libs/libcurl/include/curl/typecheck-gcc.h index 9e14d8a372..d7c7a9a309 100644 --- a/libs/libcurl/include/curl/typecheck-gcc.h +++ b/libs/libcurl/include/curl/typecheck-gcc.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* wraps curl_easy_setopt() with typechecking */ @@ -374,6 +376,7 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t, (option) == CURLOPT_WRITEDATA || \ (option) == CURLOPT_RESOLVER_START_DATA || \ (option) == CURLOPT_TRAILERDATA || \ + (option) == CURLOPT_SSH_HOSTKEYDATA || \ 0) /* evaluates to true if option takes a POST data argument (void* or char*) */ diff --git a/libs/libcurl/include/curl/urlapi.h b/libs/libcurl/include/curl/urlapi.h index a475f91b60..e15c213ccd 100644 --- a/libs/libcurl/include/curl/urlapi.h +++ b/libs/libcurl/include/curl/urlapi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "curl.h" diff --git a/libs/libcurl/libcurl.vcxproj b/libs/libcurl/libcurl.vcxproj index ba9f10cde8..ac9b3256ba 100644 --- a/libs/libcurl/libcurl.vcxproj +++ b/libs/libcurl/libcurl.vcxproj @@ -143,6 +143,9 @@ <ClCompile Include="src\fileinfo.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="src\fopen.c">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="src\formdata.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
@@ -493,10 +496,12 @@ <ClInclude Include="src\dotdot.h" />
<ClInclude Include="src\dynbuf.h" />
<ClInclude Include="src\easyif.h" />
+ <ClInclude Include="src\easy_lock.h" />
<ClInclude Include="src\easyoptions.h" />
<ClInclude Include="src\escape.h" />
<ClInclude Include="src\file.h" />
<ClInclude Include="src\fileinfo.h" />
+ <ClInclude Include="src\fopen.h" />
<ClInclude Include="src\formdata.h" />
<ClInclude Include="src\ftp.h" />
<ClInclude Include="src\ftplistparser.h" />
diff --git a/libs/libcurl/libcurl.vcxproj.filters b/libs/libcurl/libcurl.vcxproj.filters index 786a8c8ca4..d6047ad7e7 100644 --- a/libs/libcurl/libcurl.vcxproj.filters +++ b/libs/libcurl/libcurl.vcxproj.filters @@ -116,6 +116,9 @@ <ClCompile Include="src\fileinfo.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\fopen.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="src\formdata.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -607,6 +610,9 @@ <ClInclude Include="src\easyif.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\easy_lock.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="src\easyoptions.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -619,6 +625,9 @@ <ClInclude Include="src\fileinfo.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\fopen.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="src\formdata.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/libs/libcurl/src/CMakeLists.txt b/libs/libcurl/src/CMakeLists.txt index 46973bf2b8..f9987517d6 100644 --- a/libs/libcurl/src/CMakeLists.txt +++ b/libs/libcurl/src/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### set(LIB_NAME libcurl) set(LIBCURL_OUTPUT_NAME libcurl CACHE STRING "Basename of the curl library") @@ -40,7 +42,7 @@ list(APPEND HHEADERS ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h ) -if(WIN32) +if(WIN32 AND NOT CURL_STATICLIB) list(APPEND CSOURCES libcurl.rc) endif() diff --git a/libs/libcurl/src/Makefile.am b/libs/libcurl/src/Makefile.am index ba5f016301..18ce47ea95 100644 --- a/libs/libcurl/src/Makefile.am +++ b/libs/libcurl/src/Makefile.am @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### AUTOMAKE_OPTIONS = foreign nostdinc diff --git a/libs/libcurl/src/Makefile.in b/libs/libcurl/src/Makefile.in index 4308285306..e292dc384f 100644 --- a/libs/libcurl/src/Makefile.in +++ b/libs/libcurl/src/Makefile.in @@ -34,6 +34,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### VPATH = @srcdir@ @@ -203,7 +205,7 @@ am__objects_1 = libcurl_la-altsvc.lo libcurl_la-amigaos.lo \ libcurl_la-doh.lo libcurl_la-dotdot.lo libcurl_la-dynbuf.lo \ libcurl_la-easy.lo libcurl_la-easygetopt.lo \ libcurl_la-easyoptions.lo libcurl_la-escape.lo \ - libcurl_la-file.lo libcurl_la-fileinfo.lo \ + libcurl_la-file.lo libcurl_la-fileinfo.lo libcurl_la-fopen.lo \ libcurl_la-formdata.lo libcurl_la-ftp.lo \ libcurl_la-ftplistparser.lo libcurl_la-getenv.lo \ libcurl_la-getinfo.lo libcurl_la-gopher.lo libcurl_la-h2h3.lo \ @@ -292,23 +294,23 @@ am__objects_9 = libcurlu_la-altsvc.lo libcurlu_la-amigaos.lo \ libcurlu_la-easy.lo libcurlu_la-easygetopt.lo \ libcurlu_la-easyoptions.lo libcurlu_la-escape.lo \ libcurlu_la-file.lo libcurlu_la-fileinfo.lo \ - libcurlu_la-formdata.lo libcurlu_la-ftp.lo \ - libcurlu_la-ftplistparser.lo libcurlu_la-getenv.lo \ - libcurlu_la-getinfo.lo libcurlu_la-gopher.lo \ - libcurlu_la-h2h3.lo libcurlu_la-hash.lo libcurlu_la-headers.lo \ - libcurlu_la-hmac.lo libcurlu_la-hostasyn.lo \ - libcurlu_la-hostip.lo libcurlu_la-hostip4.lo \ - libcurlu_la-hostip6.lo libcurlu_la-hostsyn.lo \ - libcurlu_la-hsts.lo libcurlu_la-http.lo libcurlu_la-http2.lo \ - libcurlu_la-http_chunks.lo libcurlu_la-http_digest.lo \ - libcurlu_la-http_negotiate.lo libcurlu_la-http_ntlm.lo \ - libcurlu_la-http_proxy.lo libcurlu_la-http_aws_sigv4.lo \ - libcurlu_la-idn_win32.lo libcurlu_la-if2ip.lo \ - libcurlu_la-imap.lo libcurlu_la-inet_ntop.lo \ - libcurlu_la-inet_pton.lo libcurlu_la-krb5.lo \ - libcurlu_la-ldap.lo libcurlu_la-llist.lo libcurlu_la-md4.lo \ - libcurlu_la-md5.lo libcurlu_la-memdebug.lo libcurlu_la-mime.lo \ - libcurlu_la-mprintf.lo libcurlu_la-mqtt.lo \ + libcurlu_la-fopen.lo libcurlu_la-formdata.lo \ + libcurlu_la-ftp.lo libcurlu_la-ftplistparser.lo \ + libcurlu_la-getenv.lo libcurlu_la-getinfo.lo \ + libcurlu_la-gopher.lo libcurlu_la-h2h3.lo libcurlu_la-hash.lo \ + libcurlu_la-headers.lo libcurlu_la-hmac.lo \ + libcurlu_la-hostasyn.lo libcurlu_la-hostip.lo \ + libcurlu_la-hostip4.lo libcurlu_la-hostip6.lo \ + libcurlu_la-hostsyn.lo libcurlu_la-hsts.lo libcurlu_la-http.lo \ + libcurlu_la-http2.lo libcurlu_la-http_chunks.lo \ + libcurlu_la-http_digest.lo libcurlu_la-http_negotiate.lo \ + libcurlu_la-http_ntlm.lo libcurlu_la-http_proxy.lo \ + libcurlu_la-http_aws_sigv4.lo libcurlu_la-idn_win32.lo \ + libcurlu_la-if2ip.lo libcurlu_la-imap.lo \ + libcurlu_la-inet_ntop.lo libcurlu_la-inet_pton.lo \ + libcurlu_la-krb5.lo libcurlu_la-ldap.lo libcurlu_la-llist.lo \ + libcurlu_la-md4.lo libcurlu_la-md5.lo libcurlu_la-memdebug.lo \ + libcurlu_la-mime.lo libcurlu_la-mprintf.lo libcurlu_la-mqtt.lo \ libcurlu_la-multi.lo libcurlu_la-netrc.lo \ libcurlu_la-nonblock.lo libcurlu_la-openldap.lo \ libcurlu_la-parsedate.lo libcurlu_la-pingpong.lo \ @@ -411,6 +413,7 @@ am__depfiles_remade = ./$(DEPDIR)/libcurl_la-altsvc.Plo \ ./$(DEPDIR)/libcurl_la-escape.Plo \ ./$(DEPDIR)/libcurl_la-file.Plo \ ./$(DEPDIR)/libcurl_la-fileinfo.Plo \ + ./$(DEPDIR)/libcurl_la-fopen.Plo \ ./$(DEPDIR)/libcurl_la-formdata.Plo \ ./$(DEPDIR)/libcurl_la-ftp.Plo \ ./$(DEPDIR)/libcurl_la-ftplistparser.Plo \ @@ -528,6 +531,7 @@ am__depfiles_remade = ./$(DEPDIR)/libcurl_la-altsvc.Plo \ ./$(DEPDIR)/libcurlu_la-escape.Plo \ ./$(DEPDIR)/libcurlu_la-file.Plo \ ./$(DEPDIR)/libcurlu_la-fileinfo.Plo \ + ./$(DEPDIR)/libcurlu_la-fopen.Plo \ ./$(DEPDIR)/libcurlu_la-formdata.Plo \ ./$(DEPDIR)/libcurlu_la-ftp.Plo \ ./$(DEPDIR)/libcurlu_la-ftplistparser.Plo \ @@ -968,6 +972,8 @@ top_srcdir = @top_srcdir@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### AUTOMAKE_OPTIONS = foreign nostdinc CMAKE_DIST = CMakeLists.txt curl_config.h.cmake @@ -1130,6 +1136,7 @@ LIB_CFILES = \ escape.c \ file.c \ fileinfo.c \ + fopen.c \ formdata.c \ ftp.c \ ftplistparser.c \ @@ -1257,11 +1264,13 @@ LIB_HFILES = \ doh.h \ dotdot.h \ dynbuf.h \ + easy_lock.h \ easyif.h \ easyoptions.h \ escape.h \ file.h \ fileinfo.h \ + fopen.h \ formdata.h \ ftp.h \ ftplistparser.h \ @@ -1680,6 +1689,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-escape.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-file.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-fileinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-fopen.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-formdata.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-ftp.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurl_la-ftplistparser.Plo@am__quote@ # am--include-marker @@ -1800,6 +1810,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-escape.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-file.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-fileinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-fopen.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-formdata.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-ftp.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcurlu_la-ftplistparser.Plo@am__quote@ # am--include-marker @@ -2257,6 +2268,13 @@ libcurl_la-fileinfo.lo: fileinfo.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurl_la_CPPFLAGS) $(CPPFLAGS) $(libcurl_la_CFLAGS) $(CFLAGS) -c -o libcurl_la-fileinfo.lo `test -f 'fileinfo.c' || echo '$(srcdir)/'`fileinfo.c +libcurl_la-fopen.lo: fopen.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurl_la_CPPFLAGS) $(CPPFLAGS) $(libcurl_la_CFLAGS) $(CFLAGS) -MT libcurl_la-fopen.lo -MD -MP -MF $(DEPDIR)/libcurl_la-fopen.Tpo -c -o libcurl_la-fopen.lo `test -f 'fopen.c' || echo '$(srcdir)/'`fopen.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcurl_la-fopen.Tpo $(DEPDIR)/libcurl_la-fopen.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fopen.c' object='libcurl_la-fopen.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurl_la_CPPFLAGS) $(CPPFLAGS) $(libcurl_la_CFLAGS) $(CFLAGS) -c -o libcurl_la-fopen.lo `test -f 'fopen.c' || echo '$(srcdir)/'`fopen.c + libcurl_la-formdata.lo: formdata.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurl_la_CPPFLAGS) $(CPPFLAGS) $(libcurl_la_CFLAGS) $(CFLAGS) -MT libcurl_la-formdata.lo -MD -MP -MF $(DEPDIR)/libcurl_la-formdata.Tpo -c -o libcurl_la-formdata.lo `test -f 'formdata.c' || echo '$(srcdir)/'`formdata.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcurl_la-formdata.Tpo $(DEPDIR)/libcurl_la-formdata.Plo @@ -3349,6 +3367,13 @@ libcurlu_la-fileinfo.lo: fileinfo.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurlu_la_CPPFLAGS) $(CPPFLAGS) $(libcurlu_la_CFLAGS) $(CFLAGS) -c -o libcurlu_la-fileinfo.lo `test -f 'fileinfo.c' || echo '$(srcdir)/'`fileinfo.c +libcurlu_la-fopen.lo: fopen.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurlu_la_CPPFLAGS) $(CPPFLAGS) $(libcurlu_la_CFLAGS) $(CFLAGS) -MT libcurlu_la-fopen.lo -MD -MP -MF $(DEPDIR)/libcurlu_la-fopen.Tpo -c -o libcurlu_la-fopen.lo `test -f 'fopen.c' || echo '$(srcdir)/'`fopen.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcurlu_la-fopen.Tpo $(DEPDIR)/libcurlu_la-fopen.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fopen.c' object='libcurlu_la-fopen.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurlu_la_CPPFLAGS) $(CPPFLAGS) $(libcurlu_la_CFLAGS) $(CFLAGS) -c -o libcurlu_la-fopen.lo `test -f 'fopen.c' || echo '$(srcdir)/'`fopen.c + libcurlu_la-formdata.lo: formdata.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurlu_la_CPPFLAGS) $(CPPFLAGS) $(libcurlu_la_CFLAGS) $(CFLAGS) -MT libcurlu_la-formdata.lo -MD -MP -MF $(DEPDIR)/libcurlu_la-formdata.Tpo -c -o libcurlu_la-formdata.lo `test -f 'formdata.c' || echo '$(srcdir)/'`formdata.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcurlu_la-formdata.Tpo $(DEPDIR)/libcurlu_la-formdata.Plo @@ -4353,6 +4378,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libcurl_la-escape.Plo -rm -f ./$(DEPDIR)/libcurl_la-file.Plo -rm -f ./$(DEPDIR)/libcurl_la-fileinfo.Plo + -rm -f ./$(DEPDIR)/libcurl_la-fopen.Plo -rm -f ./$(DEPDIR)/libcurl_la-formdata.Plo -rm -f ./$(DEPDIR)/libcurl_la-ftp.Plo -rm -f ./$(DEPDIR)/libcurl_la-ftplistparser.Plo @@ -4473,6 +4499,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libcurlu_la-escape.Plo -rm -f ./$(DEPDIR)/libcurlu_la-file.Plo -rm -f ./$(DEPDIR)/libcurlu_la-fileinfo.Plo + -rm -f ./$(DEPDIR)/libcurlu_la-fopen.Plo -rm -f ./$(DEPDIR)/libcurlu_la-formdata.Plo -rm -f ./$(DEPDIR)/libcurlu_la-ftp.Plo -rm -f ./$(DEPDIR)/libcurlu_la-ftplistparser.Plo @@ -4710,6 +4737,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libcurl_la-escape.Plo -rm -f ./$(DEPDIR)/libcurl_la-file.Plo -rm -f ./$(DEPDIR)/libcurl_la-fileinfo.Plo + -rm -f ./$(DEPDIR)/libcurl_la-fopen.Plo -rm -f ./$(DEPDIR)/libcurl_la-formdata.Plo -rm -f ./$(DEPDIR)/libcurl_la-ftp.Plo -rm -f ./$(DEPDIR)/libcurl_la-ftplistparser.Plo @@ -4830,6 +4858,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libcurlu_la-escape.Plo -rm -f ./$(DEPDIR)/libcurlu_la-file.Plo -rm -f ./$(DEPDIR)/libcurlu_la-fileinfo.Plo + -rm -f ./$(DEPDIR)/libcurlu_la-fopen.Plo -rm -f ./$(DEPDIR)/libcurlu_la-formdata.Plo -rm -f ./$(DEPDIR)/libcurlu_la-ftp.Plo -rm -f ./$(DEPDIR)/libcurlu_la-ftplistparser.Plo diff --git a/libs/libcurl/src/Makefile.inc b/libs/libcurl/src/Makefile.inc index 1ab0078966..9bd8e324bd 100644 --- a/libs/libcurl/src/Makefile.inc +++ b/libs/libcurl/src/Makefile.inc @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### LIB_VAUTH_CFILES = \ @@ -135,6 +137,7 @@ LIB_CFILES = \ escape.c \ file.c \ fileinfo.c \ + fopen.c \ formdata.c \ ftp.c \ ftplistparser.c \ @@ -262,11 +265,13 @@ LIB_HFILES = \ doh.h \ dotdot.h \ dynbuf.h \ + easy_lock.h \ easyif.h \ easyoptions.h \ escape.h \ file.h \ fileinfo.h \ + fopen.h \ formdata.h \ ftp.h \ ftplistparser.h \ diff --git a/libs/libcurl/src/Makefile.m32 b/libs/libcurl/src/Makefile.m32 index 2bb208fbe4..1987b237e5 100644 --- a/libs/libcurl/src/Makefile.m32 +++ b/libs/libcurl/src/Makefile.m32 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1999 - 2022, 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 @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# #*************************************************************************** ########################################################################### @@ -108,10 +110,8 @@ CURL_RANLIB := $(CROSSPREFIX)ranlib endif CC = $(CURL_CC) -CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W -CFLAGS += -fno-strict-aliasing -# comment LDFLAGS below to keep debug info -LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s +CFLAGS = -O3 $(CURL_CFLAG_EXTRAS) -W -Wall +LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) AR = $(CURL_AR) RANLIB = $(CURL_RANLIB) RC = $(CROSSPREFIX)windres @@ -128,7 +128,7 @@ endif endif ifeq ($(ARCH),w64) -CFLAGS += -m64 -D_AMD64_ +CFLAGS += -m64 LDFLAGS += -m64 RCFLAGS += -F pe-x86-64 else @@ -320,8 +320,7 @@ ifdef SSL OPENSSL_LIBS += -lgdi32 -lcrypt32 endif INCLUDES += -I"$(OPENSSL_INCLUDE)" - CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_PKCS12_H \ - -DOPENSSL_NO_KRB5 + CFLAGS += -DUSE_OPENSSL DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) ifdef SRP ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h" @@ -381,7 +380,7 @@ ifdef SPNEGO CFLAGS += -DHAVE_SPNEGO endif ifdef IPV6 - CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501 + CFLAGS += -DENABLE_IPV6 endif ifdef LDAPS CFLAGS += -DHAVE_LDAP_SSL diff --git a/libs/libcurl/src/altsvc.c b/libs/libcurl/src/altsvc.c index dd2d0ebed6..2c0b3bdc43 100644 --- a/libs/libcurl/src/altsvc.c +++ b/libs/libcurl/src/altsvc.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* * The Alt-Svc: header is defined in RFC 7838: @@ -34,7 +36,7 @@ #include "parsedate.h" #include "sendf.h" #include "warnless.h" -#include "rand.h" +#include "fopen.h" #include "rename.h" /* The last 3 #include files should be in this order */ @@ -184,10 +186,9 @@ static CURLcode altsvc_add(struct altsvcinfo *asi, char *line) /* * Load alt-svc entries from the given file. The text based line-oriented file - * format is documented here: - * https://github.com/curl/curl/wiki/QUIC-implementation + * format is documented here: https://curl.se/docs/alt-svc.html * - * This function only returns error on major problems that prevents alt-svc + * This function only returns error on major problems that prevent alt-svc * handling to work completely. It will ignore individual syntactical errors * etc. */ @@ -336,8 +337,7 @@ CURLcode Curl_altsvc_save(struct Curl_easy *data, struct Curl_llist_element *n; CURLcode result = CURLE_OK; FILE *out; - char *tempstore; - unsigned char randsuffix[9]; + char *tempstore = NULL; if(!altsvc) /* no cache activated */ @@ -351,17 +351,8 @@ CURLcode Curl_altsvc_save(struct Curl_easy *data, /* marked as read-only, no file or zero length file name */ return CURLE_OK; - if(Curl_rand_hex(data, randsuffix, sizeof(randsuffix))) - return CURLE_FAILED_INIT; - - tempstore = aprintf("%s.%s.tmp", file, randsuffix); - if(!tempstore) - return CURLE_OUT_OF_MEMORY; - - out = fopen(tempstore, FOPEN_WRITETEXT); - if(!out) - result = CURLE_WRITE_ERROR; - else { + result = Curl_fopen(data, file, &out, &tempstore); + if(!result) { fputs("# Your alt-svc cache. https://curl.se/docs/alt-svc.html\n" "# This file was generated by libcurl! Edit at your own risk.\n", out); @@ -373,10 +364,10 @@ CURLcode Curl_altsvc_save(struct Curl_easy *data, break; } fclose(out); - if(!result && Curl_rename(tempstore, file)) + if(!result && tempstore && Curl_rename(tempstore, file)) result = CURLE_WRITE_ERROR; - if(result) + if(result && tempstore) unlink(tempstore); } free(tempstore); diff --git a/libs/libcurl/src/altsvc.h b/libs/libcurl/src/altsvc.h index 2ab89e7059..2751d272a1 100644 --- a/libs/libcurl/src/altsvc.h +++ b/libs/libcurl/src/altsvc.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2019 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2019 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/amigaos.c b/libs/libcurl/src/amigaos.c index 78bb22c7e2..6c144095f8 100644 --- a/libs/libcurl/src/amigaos.c +++ b/libs/libcurl/src/amigaos.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/amigaos.h b/libs/libcurl/src/amigaos.h index 02e5bb546a..8757aa8e73 100644 --- a/libs/libcurl/src/amigaos.h +++ b/libs/libcurl/src/amigaos.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/arpa_telnet.h b/libs/libcurl/src/arpa_telnet.h index cbe31de5a3..523f7f51e7 100644 --- a/libs/libcurl/src/arpa_telnet.h +++ b/libs/libcurl/src/arpa_telnet.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_TELNET /* diff --git a/libs/libcurl/src/asyn-ares.c b/libs/libcurl/src/asyn-ares.c index c885adef54..8b620a1d64 100644 --- a/libs/libcurl/src/asyn-ares.c +++ b/libs/libcurl/src/asyn-ares.c @@ -18,6 +18,8 @@ * 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" @@ -306,7 +308,7 @@ int Curl_resolver_getsock(struct Curl_easy *data, * 2) wait for the timeout period to check for action on ares' sockets. * 3) tell ares to act on all the sockets marked as "with action" * - * return number of sockets it worked on + * return number of sockets it worked on, or -1 on error */ static int waitperform(struct Curl_easy *data, timediff_t timeout_ms) @@ -338,8 +340,11 @@ static int waitperform(struct Curl_easy *data, timediff_t timeout_ms) break; } - if(num) + if(num) { nfds = Curl_poll(pfd, num, timeout_ms); + if(nfds < 0) + return -1; + } else nfds = 0; @@ -376,7 +381,8 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data, DEBUGASSERT(dns); *dns = NULL; - waitperform(data, 0); + if(waitperform(data, 0) < 0) + return CURLE_UNRECOVERABLE_POLL; #ifndef HAVE_CARES_GETADDRINFO /* Now that we've checked for any last minute results above, see if there are @@ -475,7 +481,8 @@ CURLcode Curl_resolver_wait_resolv(struct Curl_easy *data, else timeout_ms = 1000; - waitperform(data, timeout_ms); + if(waitperform(data, timeout_ms) < 0) + return CURLE_UNRECOVERABLE_POLL; result = Curl_resolver_is_resolved(data, entry); if(result || data->state.async.done) diff --git a/libs/libcurl/src/asyn-thread.c b/libs/libcurl/src/asyn-thread.c index 149172ad3d..d0edc32608 100644 --- a/libs/libcurl/src/asyn-thread.c +++ b/libs/libcurl/src/asyn-thread.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/asyn.h b/libs/libcurl/src/asyn.h index 3130395826..80ca54d787 100644 --- a/libs/libcurl/src/asyn.h +++ b/libs/libcurl/src/asyn.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/base64.c b/libs/libcurl/src/base64.c index 960a1ca3ad..d5d79cf96b 100644 --- a/libs/libcurl/src/base64.c +++ b/libs/libcurl/src/base64.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* Base64 encoding/decoding */ diff --git a/libs/libcurl/src/bufref.c b/libs/libcurl/src/bufref.c index b84511e185..91b037431d 100644 --- a/libs/libcurl/src/bufref.c +++ b/libs/libcurl/src/bufref.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2021 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/bufref.h b/libs/libcurl/src/bufref.h index 25f65d894d..96b818b537 100644 --- a/libs/libcurl/src/bufref.h +++ b/libs/libcurl/src/bufref.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2021 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/c-hyper.c b/libs/libcurl/src/c-hyper.c index 69082982cf..69b904e531 100644 --- a/libs/libcurl/src/c-hyper.c +++ b/libs/libcurl/src/c-hyper.c @@ -18,6 +18,8 @@ * 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" @@ -288,7 +290,7 @@ static CURLcode status_line(struct Curl_easy *data, len); if(!data->state.hconnect || !data->set.suppress_connect_headers) { - writetype = CLIENTWRITE_HEADER; + writetype = CLIENTWRITE_HEADER|CLIENTWRITE_STATUS; if(data->set.include_header) writetype |= CLIENTWRITE_BODY; result = Curl_client_write(data, writetype, @@ -1047,6 +1049,21 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) goto error; } +#ifndef CURL_DISABLE_ALTSVC + if(conn->bits.altused && !Curl_checkheaders(data, STRCONST("Alt-Used"))) { + char *altused = aprintf("Alt-Used: %s:%d\r\n", + conn->conn_to_host.name, conn->conn_to_port); + if(!altused) { + result = CURLE_OUT_OF_MEMORY; + goto error; + } + result = Curl_hyper_header(data, headers, altused); + if(result) + goto error; + free(altused); + } +#endif + #ifndef CURL_DISABLE_PROXY if(conn->bits.httpproxy && !conn->bits.tunnel_proxy && !Curl_checkheaders(data, STRCONST("Proxy-Connection")) && diff --git a/libs/libcurl/src/c-hyper.h b/libs/libcurl/src/c-hyper.h index d63defeffe..91a62619c3 100644 --- a/libs/libcurl/src/c-hyper.h +++ b/libs/libcurl/src/c-hyper.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/config-amigaos.h b/libs/libcurl/src/config-amigaos.h index 842cbc247b..79186c6378 100644 --- a/libs/libcurl/src/config-amigaos.h +++ b/libs/libcurl/src/config-amigaos.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* ================================================================ */ diff --git a/libs/libcurl/src/config-dos.h b/libs/libcurl/src/config-dos.h index b8e7dbd3fb..9fb7743957 100644 --- a/libs/libcurl/src/config-dos.h +++ b/libs/libcurl/src/config-dos.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ diff --git a/libs/libcurl/src/config-mac.h b/libs/libcurl/src/config-mac.h index 22d32d480d..dd1d9a7ea6 100644 --- a/libs/libcurl/src/config-mac.h +++ b/libs/libcurl/src/config-mac.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* =================================================================== */ diff --git a/libs/libcurl/src/config-os400.h b/libs/libcurl/src/config-os400.h index dc9e206605..f6113fc699 100644 --- a/libs/libcurl/src/config-os400.h +++ b/libs/libcurl/src/config-os400.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* ================================================================ */ diff --git a/libs/libcurl/src/config-plan9.h b/libs/libcurl/src/config-plan9.h index dbe9b82af6..75aac7272f 100644 --- a/libs/libcurl/src/config-plan9.h +++ b/libs/libcurl/src/config-plan9.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #define BUILDING_LIBCURL 1 diff --git a/libs/libcurl/src/config-riscos.h b/libs/libcurl/src/config-riscos.h index 9986b20fba..3836562402 100644 --- a/libs/libcurl/src/config-riscos.h +++ b/libs/libcurl/src/config-riscos.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* ================================================================ */ diff --git a/libs/libcurl/src/config-win32.h b/libs/libcurl/src/config-win32.h index f9f44ea100..932515667f 100644 --- a/libs/libcurl/src/config-win32.h +++ b/libs/libcurl/src/config-win32.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* ================================================================ */ @@ -224,10 +226,6 @@ /* Define if you have the socket function. */ #define HAVE_SOCKET 1 -/* Define if libSSH2 is in use */ -#define USE_LIBSSH2 1 -#define HAVE_LIBSSH2_H 1 - /* Define if you have the strcasecmp function. */ #ifdef __MINGW32__ #define HAVE_STRCASECMP 1 @@ -455,9 +453,6 @@ /* mingw-w64, mingw using >= MSVCR80, and visual studio >= 2005 (MSVCR80) all default to 64-bit time_t unless _USE_32BIT_TIME_T is defined */ -#ifdef __MINGW32__ -# include <_mingw.h> -#endif #if defined(__MINGW64_VERSION_MAJOR) || \ (defined(__MINGW32__) && (__MSVCRT_VERSION__ >= 0x0800)) || \ (defined(_MSC_VER) && (_MSC_VER >= 1400)) @@ -655,9 +650,6 @@ Vista # define CURL_DISABLE_LDAP 1 #endif -/* if SSL is enabled */ -#define USE_OPENSSL 1 - /* Define to use the Windows crypto library. */ #if !defined(CURL_WINDOWS_APP) #define USE_WIN32_CRYPTO diff --git a/libs/libcurl/src/config-win32ce.h b/libs/libcurl/src/config-win32ce.h index ca197d69bc..90f9eeae2f 100644 --- a/libs/libcurl/src/config-win32ce.h +++ b/libs/libcurl/src/config-win32ce.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* ================================================================ */ diff --git a/libs/libcurl/src/conncache.c b/libs/libcurl/src/conncache.c index aa29620fa3..2a399c8814 100644 --- a/libs/libcurl/src/conncache.c +++ b/libs/libcurl/src/conncache.c @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/conncache.h b/libs/libcurl/src/conncache.h index ef11dcfd29..6ec2757433 100644 --- a/libs/libcurl/src/conncache.h +++ b/libs/libcurl/src/conncache.h @@ -21,6 +21,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/connect.c b/libs/libcurl/src/connect.c index 9bcf525ebb..424197234c 100644 --- a/libs/libcurl/src/connect.c +++ b/libs/libcurl/src/connect.c @@ -18,6 +18,8 @@ * 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" @@ -470,8 +472,10 @@ static CURLcode bindlocal(struct Curl_easy *data, } if(--portnum > 0) { - infof(data, "Bind to local port %hu failed, trying next", port); port++; /* try next port */ + if(port == 0) + break; + infof(data, "Bind to local port %hu failed, trying next", port - 1); /* We re-use/clobber the port variable here below */ if(sock->sa_family == AF_INET) si4->sin_port = ntohs(port); @@ -1636,6 +1640,24 @@ CURLcode Curl_socket(struct Curl_easy *data, if(conn->transport == TRNSPRT_QUIC) { /* QUIC sockets need to be nonblocking */ (void)curlx_nonblock(*sockfd, TRUE); + switch(addr->family) { +#if defined(__linux__) && defined(IP_MTU_DISCOVER) + case AF_INET: { + int val = IP_PMTUDISC_DO; + (void)setsockopt(*sockfd, IPPROTO_IP, IP_MTU_DISCOVER, &val, + sizeof(val)); + break; + } +#endif +#if defined(__linux__) && defined(IPV6_MTU_DISCOVER) + case AF_INET6: { + int val = IPV6_PMTUDISC_DO; + (void)setsockopt(*sockfd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &val, + sizeof(val)); + break; + } +#endif + } } #if defined(ENABLE_IPV6) && defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID) diff --git a/libs/libcurl/src/connect.h b/libs/libcurl/src/connect.h index 1a055f58de..582ff0813d 100644 --- a/libs/libcurl/src/connect.h +++ b/libs/libcurl/src/connect.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/content_encoding.c b/libs/libcurl/src/content_encoding.c index c03637a391..95ba48a2dd 100644 --- a/libs/libcurl/src/content_encoding.c +++ b/libs/libcurl/src/content_encoding.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" @@ -1026,12 +1028,16 @@ static const struct content_encoding *find_encoding(const char *name, return NULL; } +/* allow no more than 5 "chained" compression steps */ +#define MAX_ENCODE_STACK 5 + /* Set-up the unencoding stack from the Content-Encoding header value. * See RFC 7231 section 3.1.2.2. */ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data, const char *enclist, int maybechunked) { struct SingleRequest *k = &data->req; + int counter = 0; do { const char *name; @@ -1066,6 +1072,11 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data, if(!encoding) encoding = &error_encoding; /* Defer error at stack use. */ + if(++counter >= MAX_ENCODE_STACK) { + failf(data, "Reject response due to %u content encodings", + counter); + return CURLE_BAD_CONTENT_ENCODING; + } /* Stack the unencoding stage. */ writer = new_unencoding_writer(data, encoding, k->writer_stack); if(!writer) diff --git a/libs/libcurl/src/content_encoding.h b/libs/libcurl/src/content_encoding.h index acfd0c27b0..81bddd1be1 100644 --- a/libs/libcurl/src/content_encoding.h +++ b/libs/libcurl/src/content_encoding.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/cookie.c b/libs/libcurl/src/cookie.c index 0c2d49b478..cb57b86387 100644 --- a/libs/libcurl/src/cookie.c +++ b/libs/libcurl/src/cookie.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /*** @@ -33,8 +35,9 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, called before any cookies are set. struct Cookie *Curl_cookie_add(struct Curl_easy *data, - struct CookieInfo *c, bool httpheader, char *lineptr, - const char *domain, const char *path); + struct CookieInfo *c, bool httpheader, bool noexpire, + char *lineptr, const char *domain, const char *path, + bool secure); The 'lineptr' parameter is a full "Set-cookie:" line as received from a server. @@ -96,8 +99,8 @@ Example set of cookies: #include "curl_get_line.h" #include "curl_memrchr.h" #include "parsedate.h" -#include "rand.h" #include "rename.h" +#include "fopen.h" /* The last 3 #include files should be in this order */ #include "curl_printf.h" @@ -468,6 +471,8 @@ Curl_cookie_add(struct Curl_easy *data, struct Cookie *clist; struct Cookie *co; struct Cookie *lastc = NULL; + struct Cookie *replace_co = NULL; + struct Cookie *replace_clist = NULL; time_t now = time(NULL); bool replace_old = FALSE; bool badcookie = FALSE; /* cookies are good by default. mmmmm yummy */ @@ -477,6 +482,10 @@ Curl_cookie_add(struct Curl_easy *data, (void)data; #endif + DEBUGASSERT(MAX_SET_COOKIE_AMOUNT <= 255); /* counter is an unsigned char */ + if(data->req.setcookies >= MAX_SET_COOKIE_AMOUNT) + return NULL; + /* First, alloc and init a new struct for it */ co = calloc(1, sizeof(struct Cookie)); if(!co) @@ -816,7 +825,7 @@ Curl_cookie_add(struct Curl_easy *data, freecookie(co); return NULL; } - + data->req.setcookies++; } else { /* @@ -1020,12 +1029,53 @@ Curl_cookie_add(struct Curl_easy *data, } #endif + /* A non-secure cookie may not overlay an existing secure cookie. */ myhash = cookiehash(co->domain); clist = c->cookies[myhash]; - replace_old = FALSE; while(clist) { if(strcasecompare(clist->name, co->name)) { /* the names are identical */ + bool matching_domains = FALSE; + + if(clist->domain && co->domain) { + if(strcasecompare(clist->domain, co->domain)) + /* The domains are identical */ + matching_domains = TRUE; + } + else if(!clist->domain && !co->domain) + matching_domains = TRUE; + + if(matching_domains && /* the domains were identical */ + clist->spath && co->spath && /* both have paths */ + clist->secure && !co->secure && !secure) { + size_t cllen; + const char *sep; + + /* + * A non-secure cookie may not overlay an existing secure cookie. + * For an existing cookie "a" with path "/login", refuse a new + * cookie "a" with for example path "/login/en", while the path + * "/loginhelper" is ok. + */ + + sep = strchr(clist->spath + 1, '/'); + + if(sep) + cllen = sep - clist->spath; + else + cllen = strlen(clist->spath); + + if(strncasecompare(clist->spath, co->spath, cllen)) { + infof(data, "cookie '%s' for domain '%s' dropped, would " + "overlay an existing cookie", co->name, co->domain); + freecookie(co); + return NULL; + } + } + } + + if(!replace_co && strcasecompare(clist->name, co->name)) { + /* the names are identical */ if(clist->domain && co->domain) { if(strcasecompare(clist->domain, co->domain) && @@ -1040,30 +1090,7 @@ Curl_cookie_add(struct Curl_easy *data, /* the domains were identical */ if(clist->spath && co->spath) { - if(clist->secure && !co->secure && !secure) { - size_t cllen; - const char *sep; - - /* - * A non-secure cookie may not overlay an existing secure cookie. - * For an existing cookie "a" with path "/login", refuse a new - * cookie "a" with for example path "/login/en", while the path - * "/loginhelper" is ok. - */ - - sep = strchr(clist->spath + 1, '/'); - - if(sep) - cllen = sep - clist->spath; - else - cllen = strlen(clist->spath); - - if(strncasecompare(clist->spath, co->spath, cllen)) { - freecookie(co); - return NULL; - } - } - else if(strcasecompare(clist->spath, co->spath)) + if(strcasecompare(clist->spath, co->spath)) replace_old = TRUE; else replace_old = FALSE; @@ -1085,42 +1112,37 @@ Curl_cookie_add(struct Curl_easy *data, freecookie(co); return NULL; } - if(replace_old) { - co->next = clist->next; /* get the next-pointer first */ - - /* when replacing, creationtime is kept from old */ - co->creationtime = clist->creationtime; - - /* then free all the old pointers */ - free(clist->name); - free(clist->value); - free(clist->domain); - free(clist->path); - free(clist->spath); - free(clist->expirestr); - free(clist->version); - free(clist->maxage); - - *clist = *co; /* then store all the new data */ - - free(co); /* free the newly allocated memory */ - co = clist; /* point to the previous struct instead */ - - /* - * We have replaced a cookie, now skip the rest of the list but make - * sure the 'lastc' pointer is properly set - */ - do { - lastc = clist; - clist = clist->next; - } while(clist); - break; + replace_co = co; + replace_clist = clist; } } lastc = clist; clist = clist->next; } + if(replace_co) { + co = replace_co; + clist = replace_clist; + co->next = clist->next; /* get the next-pointer first */ + + /* when replacing, creationtime is kept from old */ + co->creationtime = clist->creationtime; + + /* then free all the old pointers */ + free(clist->name); + free(clist->value); + free(clist->domain); + free(clist->path); + free(clist->spath); + free(clist->expirestr); + free(clist->version); + free(clist->maxage); + + *clist = *co; /* then store all the new data */ + + free(co); /* free the newly allocated memory */ + co = clist; + } if(c->running) /* Only show this when NOT reading the cookies from a file */ @@ -1357,7 +1379,8 @@ static struct Cookie *dup_cookie(struct Cookie *src) * * It shall only return cookies that haven't expired. */ -struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, +struct Cookie *Curl_cookie_getlist(struct Curl_easy *data, + struct CookieInfo *c, const char *host, const char *path, bool secure) { @@ -1412,6 +1435,11 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, mainco = newco; matches++; + if(matches >= MAX_COOKIE_SEND_AMOUNT) { + infof(data, "Included max number of cookies (%u) in request!", + matches); + break; + } } else goto fail; @@ -1613,20 +1641,9 @@ static CURLcode cookie_output(struct Curl_easy *data, use_stdout = TRUE; } else { - unsigned char randsuffix[9]; - - if(Curl_rand_hex(data, randsuffix, sizeof(randsuffix))) - return 2; - - tempstore = aprintf("%s.%s.tmp", filename, randsuffix); - if(!tempstore) - return CURLE_OUT_OF_MEMORY; - - out = fopen(tempstore, FOPEN_WRITETEXT); - if(!out) { - error = CURLE_WRITE_ERROR; + error = Curl_fopen(data, filename, &out, &tempstore); + if(error) goto error; - } } fputs("# Netscape HTTP Cookie File\n" @@ -1673,7 +1690,7 @@ static CURLcode cookie_output(struct Curl_easy *data, if(!use_stdout) { fclose(out); out = NULL; - if(Curl_rename(tempstore, filename)) { + if(tempstore && Curl_rename(tempstore, filename)) { unlink(tempstore); error = CURLE_WRITE_ERROR; goto error; diff --git a/libs/libcurl/src/cookie.h b/libs/libcurl/src/cookie.h index 0ffe08e63a..abc0a2e8a0 100644 --- a/libs/libcurl/src/cookie.h +++ b/libs/libcurl/src/cookie.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" @@ -81,10 +83,26 @@ struct CookieInfo { */ #define MAX_COOKIE_LINE 5000 -/* This is the maximum length of a cookie name or content we deal with: */ +/* Maximum length of an incoming cookie name or content we deal with. Longer + cookies are ignored. */ #define MAX_NAME 4096 #define MAX_NAME_TXT "4095" +/* Maximum size for an outgoing cookie line libcurl will use in an http + request. This is the default maximum length used in some versions of Apache + httpd. */ +#define MAX_COOKIE_HEADER_LEN 8190 + +/* Maximum number of cookies libcurl will send in a single request, even if + there might be more cookies that match. One reason to cap the number is to + keep the maximum HTTP request within the maximum allowed size. */ +#define MAX_COOKIE_SEND_AMOUNT 150 + +/* Maximum number of Set-Cookie: lines accepted in a single response. If more + such header lines are received, they are ignored. This value must be less + than 256 since an unsigned char is used to count. */ +#define MAX_SET_COOKIE_AMOUNT 50 + struct Curl_easy; /* * Add a cookie to the internal list of cookies. The domain and path arguments @@ -97,7 +115,8 @@ struct Cookie *Curl_cookie_add(struct Curl_easy *data, const char *domain, const char *path, bool secure); -struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, const char *host, +struct Cookie *Curl_cookie_getlist(struct Curl_easy *data, + struct CookieInfo *c, const char *host, const char *path, bool secure); void Curl_cookie_freelist(struct Cookie *cookies); void Curl_cookie_clearall(struct CookieInfo *cookies); diff --git a/libs/libcurl/src/curl_addrinfo.c b/libs/libcurl/src/curl_addrinfo.c index 842fd7fe24..d5d11113f4 100644 --- a/libs/libcurl/src/curl_addrinfo.c +++ b/libs/libcurl/src/curl_addrinfo.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_addrinfo.h b/libs/libcurl/src/curl_addrinfo.h index 73a8c1b334..b778121a7c 100644 --- a/libs/libcurl/src/curl_addrinfo.h +++ b/libs/libcurl/src/curl_addrinfo.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_base64.h b/libs/libcurl/src/curl_base64.h index 4cb9d73537..85368a163c 100644 --- a/libs/libcurl/src/curl_base64.h +++ b/libs/libcurl/src/curl_base64.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ CURLcode Curl_base64_encode(const char *inputbuff, size_t insize, diff --git a/libs/libcurl/src/curl_config.h.cmake b/libs/libcurl/src/curl_config.h.cmake index 6b55a3c551..eb2c62b971 100644 --- a/libs/libcurl/src/curl_config.h.cmake +++ b/libs/libcurl/src/curl_config.h.cmake @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* lib/curl_config.h.in. Generated somehow by cmake. */ @@ -157,6 +159,9 @@ /* Define to 1 if you have the <assert.h> header file. */ #cmakedefine HAVE_ASSERT_H 1 +/* Define to 1 if you have the `fchmod' function. */ +#cmakedefine HAVE_FCHMOD 1 + /* Define to 1 if you have the `basename' function. */ #cmakedefine HAVE_BASENAME 1 @@ -383,6 +388,12 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ #cmakedefine HAVE_LIBSOCKET 1 +/* Define to 1 if you have the `psl' library (-lpsl). */ +#cmakedefine HAVE_LIBPSL 1 + +/* Define to 1 if you have the <libpsl.h> header file. */ +#cmakedefine HAVE_LIBPSL_H 1 + /* Define to 1 if you have the `ssh2' library (-lssh2). */ #cmakedefine HAVE_LIBSSH2 1 @@ -915,6 +926,9 @@ ${SIZEOF_TIME_T_CODE} /* if libSSH2 is in use */ #cmakedefine USE_LIBSSH2 1 +/* if libPSL is in use */ +#cmakedefine USE_LIBPSL 1 + /* If you want to build curl with the built-in manual */ #cmakedefine USE_MANUAL 1 diff --git a/libs/libcurl/src/curl_config.h.in b/libs/libcurl/src/curl_config.h.in index 40176f9325..e9dbf75734 100644 --- a/libs/libcurl/src/curl_config.h.in +++ b/libs/libcurl/src/curl_config.h.in @@ -42,6 +42,9 @@ /* to disable Gopher */ #undef CURL_DISABLE_GOPHER +/* disable headers-api */ +#undef CURL_DISABLE_HEADERS_API + /* disable alt-svc */ #undef CURL_DISABLE_HSTS @@ -150,6 +153,9 @@ /* Define to 1 if you have the <assert.h> header file. */ #undef HAVE_ASSERT_H +/* Define to 1 if you have _Atomic support. */ +#undef HAVE_ATOMIC + /* Define to 1 if you have the basename function. */ #undef HAVE_BASENAME @@ -199,6 +205,9 @@ /* Define to 1 if you have the <err.h> header file. */ #undef HAVE_ERR_H +/* Define to 1 if you have the `fchmod' function. */ +#undef HAVE_FCHMOD + /* Define to 1 if you have the fcntl function. */ #undef HAVE_FCNTL @@ -461,6 +470,9 @@ /* Define to 1 if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H +/* Define to 1 if you have the <netinet/udp.h> header file. */ +#undef HAVE_NETINET_UDP_H + /* Define to 1 if you have the <net/if.h> header file. */ #undef HAVE_NET_IF_H @@ -550,12 +562,18 @@ /* Define to 1 if you have the <rsa.h> header file. */ #undef HAVE_RSA_H +/* Define to 1 if you have the `sched_yield' function. */ +#undef HAVE_SCHED_YIELD + /* Define to 1 if you have the select function. */ #undef HAVE_SELECT /* Define to 1 if you have the send function. */ #undef HAVE_SEND +/* Define to 1 if you have the `sendmsg' function. */ +#undef HAVE_SENDMSG + /* Define to 1 if you have the <setjmp.h> header file. */ #undef HAVE_SETJMP_H @@ -942,9 +960,6 @@ /* GSASL support enabled */ #undef USE_GSASL -/* enable headers-api */ -#undef USE_HEADERS_API - /* if hyper is in use */ #undef USE_HYPER diff --git a/libs/libcurl/src/curl_ctype.c b/libs/libcurl/src/curl_ctype.c index 233a69e76f..e1a8445151 100644 --- a/libs/libcurl/src/curl_ctype.c +++ b/libs/libcurl/src/curl_ctype.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_ctype.h b/libs/libcurl/src/curl_ctype.h index 2fa749dca9..c70945a8d2 100644 --- a/libs/libcurl/src/curl_ctype.h +++ b/libs/libcurl/src/curl_ctype.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_des.c b/libs/libcurl/src/curl_des.c index 5f28ef4f33..6d52cd3635 100644 --- a/libs/libcurl/src/curl_des.c +++ b/libs/libcurl/src/curl_des.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_des.h b/libs/libcurl/src/curl_des.h index 3d0fd92600..c1c167471a 100644 --- a/libs/libcurl/src/curl_des.h +++ b/libs/libcurl/src/curl_des.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_endian.c b/libs/libcurl/src/curl_endian.c index ecde74bfb1..3cc7734f31 100644 --- a/libs/libcurl/src/curl_endian.c +++ b/libs/libcurl/src/curl_endian.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_endian.h b/libs/libcurl/src/curl_endian.h index 4e12d7da4d..758d55f2c5 100644 --- a/libs/libcurl/src/curl_endian.h +++ b/libs/libcurl/src/curl_endian.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* Converts a 16-bit integer from little endian */ diff --git a/libs/libcurl/src/curl_fnmatch.c b/libs/libcurl/src/curl_fnmatch.c index 4bfa58598e..0dd1eb5ef5 100644 --- a/libs/libcurl/src/curl_fnmatch.c +++ b/libs/libcurl/src/curl_fnmatch.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_fnmatch.h b/libs/libcurl/src/curl_fnmatch.h index 1c80ea7793..8324be533d 100644 --- a/libs/libcurl/src/curl_fnmatch.h +++ b/libs/libcurl/src/curl_fnmatch.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #define CURL_FNMATCH_MATCH 0 diff --git a/libs/libcurl/src/curl_get_line.c b/libs/libcurl/src/curl_get_line.c index 8f3b0bd8c1..6a26bb254f 100644 --- a/libs/libcurl/src/curl_get_line.c +++ b/libs/libcurl/src/curl_get_line.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_get_line.h b/libs/libcurl/src/curl_get_line.h index 597aa09a9c..b2a534d001 100644 --- a/libs/libcurl/src/curl_get_line.h +++ b/libs/libcurl/src/curl_get_line.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* get_line() makes sure to only return complete whole lines that fit in 'len' diff --git a/libs/libcurl/src/curl_gethostname.c b/libs/libcurl/src/curl_gethostname.c index 2d5ff61cf6..4747e938db 100644 --- a/libs/libcurl/src/curl_gethostname.c +++ b/libs/libcurl/src/curl_gethostname.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_gethostname.h b/libs/libcurl/src/curl_gethostname.h index 2161c40ac3..b7360969ac 100644 --- a/libs/libcurl/src/curl_gethostname.h +++ b/libs/libcurl/src/curl_gethostname.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* Hostname buffer size */ diff --git a/libs/libcurl/src/curl_gssapi.c b/libs/libcurl/src/curl_gssapi.c index 1543a0ff46..01ab48ec3e 100644 --- a/libs/libcurl/src/curl_gssapi.c +++ b/libs/libcurl/src/curl_gssapi.c @@ -18,6 +18,8 @@ * 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" @@ -89,7 +91,7 @@ static size_t display_gss_error(OM_uint32 status, int type, OM_uint32 maj_stat; OM_uint32 min_stat; OM_uint32 msg_ctx = 0; - gss_buffer_desc status_string; + gss_buffer_desc status_string = GSS_C_EMPTY_BUFFER; do { maj_stat = gss_display_status(&min_stat, @@ -98,10 +100,12 @@ static size_t display_gss_error(OM_uint32 status, int type, GSS_C_NO_OID, &msg_ctx, &status_string); - if(GSS_LOG_BUFFER_LEN > len + status_string.length + 3) { - len += msnprintf(buf + len, GSS_LOG_BUFFER_LEN - len, - "%.*s. ", (int)status_string.length, - (char *)status_string.value); + if(maj_stat == GSS_S_COMPLETE && status_string.length > 0) { + if(GSS_LOG_BUFFER_LEN > len + status_string.length + 3) { + len += msnprintf(buf + len, GSS_LOG_BUFFER_LEN - len, + "%.*s. ", (int)status_string.length, + (char *)status_string.value); + } } gss_release_buffer(&min_stat, &status_string); } while(!GSS_ERROR(maj_stat) && msg_ctx); diff --git a/libs/libcurl/src/curl_gssapi.h b/libs/libcurl/src/curl_gssapi.h index 466d09ed0a..b4ed482aa2 100644 --- a/libs/libcurl/src/curl_gssapi.h +++ b/libs/libcurl/src/curl_gssapi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2011 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2011 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_hmac.h b/libs/libcurl/src/curl_hmac.h index 5755655d02..77dce0f165 100644 --- a/libs/libcurl/src/curl_hmac.h +++ b/libs/libcurl/src/curl_hmac.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_CRYPTO_AUTH diff --git a/libs/libcurl/src/curl_krb5.h b/libs/libcurl/src/curl_krb5.h index ca06840742..ccd6f10e3d 100644 --- a/libs/libcurl/src/curl_krb5.h +++ b/libs/libcurl/src/curl_krb5.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ struct Curl_sec_client_mech { diff --git a/libs/libcurl/src/curl_ldap.h b/libs/libcurl/src/curl_ldap.h index 124e18b133..ba3ede4260 100644 --- a/libs/libcurl/src/curl_ldap.h +++ b/libs/libcurl/src/curl_ldap.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_LDAP extern const struct Curl_handler Curl_handler_ldap; diff --git a/libs/libcurl/src/curl_md4.h b/libs/libcurl/src/curl_md4.h index f9dafcb53c..8049355cff 100644 --- a/libs/libcurl/src/curl_md4.h +++ b/libs/libcurl/src/curl_md4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_md5.h b/libs/libcurl/src/curl_md5.h index b7d7c1f5d2..789329654b 100644 --- a/libs/libcurl/src/curl_md5.h +++ b/libs/libcurl/src/curl_md5.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_CRYPTO_AUTH diff --git a/libs/libcurl/src/curl_memory.h b/libs/libcurl/src/curl_memory.h index 5806290637..092fc9f758 100644 --- a/libs/libcurl/src/curl_memory.h +++ b/libs/libcurl/src/curl_memory.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/curl_memrchr.c b/libs/libcurl/src/curl_memrchr.c index 0bd845f690..c329a6176a 100644 --- a/libs/libcurl/src/curl_memrchr.c +++ b/libs/libcurl/src/curl_memrchr.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_memrchr.h b/libs/libcurl/src/curl_memrchr.h index c8394bb433..e7654e1d9a 100644 --- a/libs/libcurl/src/curl_memrchr.h +++ b/libs/libcurl/src/curl_memrchr.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_multibyte.c b/libs/libcurl/src/curl_multibyte.c index 32c03a5b71..309dccbfef 100644 --- a/libs/libcurl/src/curl_multibyte.c +++ b/libs/libcurl/src/curl_multibyte.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/curl_multibyte.h b/libs/libcurl/src/curl_multibyte.h index 491155e6a7..929714873a 100644 --- a/libs/libcurl/src/curl_multibyte.h +++ b/libs/libcurl/src/curl_multibyte.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_ntlm_core.c b/libs/libcurl/src/curl_ntlm_core.c index f3b8b130f1..eabb000d14 100644 --- a/libs/libcurl/src/curl_ntlm_core.c +++ b/libs/libcurl/src/curl_ntlm_core.c @@ -18,6 +18,8 @@ * 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" @@ -59,13 +61,18 @@ #if defined(USE_OPENSSL_DES) || defined(USE_WOLFSSL) #ifdef USE_WOLFSSL -#include <wolfssl/options.h> -#endif - +# include <wolfssl/options.h> +# include <wolfssl/openssl/des.h> +# include <wolfssl/openssl/md5.h> +# include <wolfssl/openssl/ssl.h> +# include <wolfssl/openssl/rand.h> +#else # include <openssl/des.h> # include <openssl/md5.h> # include <openssl/ssl.h> # include <openssl/rand.h> +#endif + # if (defined(OPENSSL_VERSION_NUMBER) && \ (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL) # define DES_key_schedule des_key_schedule diff --git a/libs/libcurl/src/curl_ntlm_core.h b/libs/libcurl/src/curl_ntlm_core.h index 5e52bb26de..60444c9dc6 100644 --- a/libs/libcurl/src/curl_ntlm_core.h +++ b/libs/libcurl/src/curl_ntlm_core.h @@ -20,6 +20,8 @@ * 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" @@ -35,10 +37,10 @@ #define NTLM_NEEDS_NSS_INIT #endif -#if defined(USE_OPENSSL) || defined(USE_WOLFSSL) #ifdef USE_WOLFSSL # include <wolfssl/options.h> -#endif +# include <wolfssl/openssl/ssl.h> +#elif defined(USE_OPENSSL) # include <openssl/ssl.h> #endif diff --git a/libs/libcurl/src/curl_ntlm_wb.c b/libs/libcurl/src/curl_ntlm_wb.c index 5a3bc3c893..f1eb9c6319 100644 --- a/libs/libcurl/src/curl_ntlm_wb.c +++ b/libs/libcurl/src/curl_ntlm_wb.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_ntlm_wb.h b/libs/libcurl/src/curl_ntlm_wb.h index 961b568733..1f04db8c3d 100644 --- a/libs/libcurl/src/curl_ntlm_wb.h +++ b/libs/libcurl/src/curl_ntlm_wb.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_path.c b/libs/libcurl/src/curl_path.c index a1669d12f7..ba1b717231 100644 --- a/libs/libcurl/src/curl_path.c +++ b/libs/libcurl/src/curl_path.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_path.h b/libs/libcurl/src/curl_path.h index a376bd1d2a..98e56eaad3 100644 --- a/libs/libcurl/src/curl_path.h +++ b/libs/libcurl/src/curl_path.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_printf.h b/libs/libcurl/src/curl_printf.h index 9fa625f108..3823828cd9 100644 --- a/libs/libcurl/src/curl_printf.h +++ b/libs/libcurl/src/curl_printf.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/curl_range.c b/libs/libcurl/src/curl_range.c index 24bdb3052e..9e03c3d4a6 100644 --- a/libs/libcurl/src/curl_range.c +++ b/libs/libcurl/src/curl_range.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_range.h b/libs/libcurl/src/curl_range.h index 0a07baf146..33570abc25 100644 --- a/libs/libcurl/src/curl_range.h +++ b/libs/libcurl/src/curl_range.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_rtmp.c b/libs/libcurl/src/curl_rtmp.c index 2fa026796e..b0c371041e 100644 --- a/libs/libcurl/src/curl_rtmp.c +++ b/libs/libcurl/src/curl_rtmp.c @@ -5,8 +5,8 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. - * Copyright (C) 2010, Howard Chu, <hyc@highlandsun.com> + * Copyright (C) 2012 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012, Howard Chu, <hyc@highlandsun.com> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/curl_rtmp.h b/libs/libcurl/src/curl_rtmp.h index f45fa71d12..f856085dc3 100644 --- a/libs/libcurl/src/curl_rtmp.h +++ b/libs/libcurl/src/curl_rtmp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010 - 2020, Howard Chu, <hyc@highlandsun.com> + * Copyright (C) 2010 - 2022, Howard Chu, <hyc@highlandsun.com> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifdef USE_LIBRTMP extern const struct Curl_handler Curl_handler_rtmp; diff --git a/libs/libcurl/src/curl_sasl.c b/libs/libcurl/src/curl_sasl.c index 48d6625ba4..9684ee476e 100644 --- a/libs/libcurl/src/curl_sasl.c +++ b/libs/libcurl/src/curl_sasl.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC2195 CRAM-MD5 authentication * RFC2617 Basic and Digest Access Authentication * RFC2831 DIGEST-MD5 authentication diff --git a/libs/libcurl/src/curl_sasl.h b/libs/libcurl/src/curl_sasl.h index d377ae7bc8..c709d56a67 100644 --- a/libs/libcurl/src/curl_sasl.h +++ b/libs/libcurl/src/curl_sasl.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> diff --git a/libs/libcurl/src/curl_setup.h b/libs/libcurl/src/curl_setup.h index 0babb032ca..4bc8aea38c 100644 --- a/libs/libcurl/src/curl_setup.h +++ b/libs/libcurl/src/curl_setup.h @@ -20,12 +20,19 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #if defined(BUILDING_LIBCURL) && !defined(CURL_NO_OLDIES) #define CURL_NO_OLDIES #endif +/* define mingw version macros, eg __MINGW{32,64}_{MINOR,MAJOR}_VERSION */ +#ifdef __MINGW32__ +#include <_mingw.h> +#endif + /* * Disable Visual Studio warnings: * 4127 "conditional expression is constant" @@ -796,6 +803,7 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, #if defined(USE_NGTCP2) || defined(USE_QUICHE) || defined(USE_MSH3) #define ENABLE_QUIC +#define USE_HTTP3 #endif #if defined(USE_UNIX_SOCKETS) && defined(WIN32) diff --git a/libs/libcurl/src/curl_setup_once.h b/libs/libcurl/src/curl_setup_once.h index 38018d23c7..656dc08373 100644 --- a/libs/libcurl/src/curl_setup_once.h +++ b/libs/libcurl/src/curl_setup_once.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ @@ -306,6 +308,14 @@ struct timeval { # define HAVE_BOOL_T #endif +/* the type we use for storing a single boolean bit */ +#ifdef _MSC_VER +typedef bool bit; +#define BIT(x) bool x +#else +typedef unsigned int bit; +#define BIT(x) bit x:1 +#endif /* * Redefine TRUE and FALSE too, to catch current use. With this diff --git a/libs/libcurl/src/curl_sha256.h b/libs/libcurl/src/curl_sha256.h index 2b7890a039..82fcdff8ea 100644 --- a/libs/libcurl/src/curl_sha256.h +++ b/libs/libcurl/src/curl_sha256.h @@ -21,6 +21,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_CRYPTO_AUTH diff --git a/libs/libcurl/src/curl_sspi.c b/libs/libcurl/src/curl_sspi.c index 339bf549fb..33108c48e9 100644 --- a/libs/libcurl/src/curl_sspi.c +++ b/libs/libcurl/src/curl_sspi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_sspi.h b/libs/libcurl/src/curl_sspi.h index 881384d4e4..ad111309c5 100644 --- a/libs/libcurl/src/curl_sspi.h +++ b/libs/libcurl/src/curl_sspi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curl_threads.c b/libs/libcurl/src/curl_threads.c index 414614401d..eb8e136087 100644 --- a/libs/libcurl/src/curl_threads.c +++ b/libs/libcurl/src/curl_threads.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/curl_threads.h b/libs/libcurl/src/curl_threads.h index e10b7a1b0e..63392f671f 100644 --- a/libs/libcurl/src/curl_threads.h +++ b/libs/libcurl/src/curl_threads.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/curlx.h b/libs/libcurl/src/curlx.h index 9f21f60d5f..1796afa00a 100644 --- a/libs/libcurl/src/curlx.h +++ b/libs/libcurl/src/curlx.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/dict.c b/libs/libcurl/src/dict.c index e23e661912..6f7678f5ca 100644 --- a/libs/libcurl/src/dict.c +++ b/libs/libcurl/src/dict.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/dict.h b/libs/libcurl/src/dict.h index 6a6c772d13..b283a0dfc1 100644 --- a/libs/libcurl/src/dict.h +++ b/libs/libcurl/src/dict.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_DICT diff --git a/libs/libcurl/src/doh.c b/libs/libcurl/src/doh.c index 4aef8b266a..a21c94f880 100644 --- a/libs/libcurl/src/doh.c +++ b/libs/libcurl/src/doh.c @@ -18,6 +18,8 @@ * 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" @@ -69,12 +71,6 @@ static const char *doh_strerror(DOHcode code) } #endif -#ifdef DEBUGBUILD -#define UNITTEST -#else -#define UNITTEST static -#endif - /* @unittest 1655 */ UNITTEST DOHcode doh_encode(const char *host, @@ -306,14 +302,6 @@ static CURLcode dohprobe(struct Curl_easy *data, } if(data->set.ssl.certinfo) ERROR_CHECK_SETOPT(CURLOPT_CERTINFO, 1L); - if(data->set.str[STRING_SSL_RANDOM_FILE]) { - ERROR_CHECK_SETOPT(CURLOPT_RANDOM_FILE, - data->set.str[STRING_SSL_RANDOM_FILE]); - } - if(data->set.str[STRING_SSL_EGDSOCKET]) { - ERROR_CHECK_SETOPT(CURLOPT_EGDSOCKET, - data->set.str[STRING_SSL_EGDSOCKET]); - } if(data->set.ssl.fsslctx) ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_FUNCTION, data->set.ssl.fsslctx); if(data->set.ssl.fsslctxp) diff --git a/libs/libcurl/src/doh.h b/libs/libcurl/src/doh.h index 70e96e012f..f8b6435350 100644 --- a/libs/libcurl/src/doh.h +++ b/libs/libcurl/src/doh.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "urldata.h" diff --git a/libs/libcurl/src/dotdot.c b/libs/libcurl/src/dotdot.c index 73ef2fa729..0b045315d0 100644 --- a/libs/libcurl/src/dotdot.c +++ b/libs/libcurl/src/dotdot.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/dotdot.h b/libs/libcurl/src/dotdot.h index ac1ea363e1..4ffe72de83 100644 --- a/libs/libcurl/src/dotdot.h +++ b/libs/libcurl/src/dotdot.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ char *Curl_dedotdotify(const char *input); #endif /* HEADER_CURL_DOTDOT_H */ diff --git a/libs/libcurl/src/dynbuf.c b/libs/libcurl/src/dynbuf.c index ada7e0ccf5..3b907dbe2e 100644 --- a/libs/libcurl/src/dynbuf.c +++ b/libs/libcurl/src/dynbuf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2020 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/dynbuf.h b/libs/libcurl/src/dynbuf.h index 252411f842..c1e97235de 100644 --- a/libs/libcurl/src/dynbuf.h +++ b/libs/libcurl/src/dynbuf.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020, 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2020 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef BUILDING_LIBCURL diff --git a/libs/libcurl/src/easy.c b/libs/libcurl/src/easy.c index bd9d695bb5..704a59df62 100644 --- a/libs/libcurl/src/easy.c +++ b/libs/libcurl/src/easy.c @@ -18,6 +18,8 @@ * 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" @@ -84,11 +86,25 @@ #include "curl_printf.h" #include "curl_memory.h" #include "memdebug.h" +#include "easy_lock.h" /* true globals -- for curl_global_init() and curl_global_cleanup() */ static unsigned int initialized; static long init_flags; +#ifdef GLOBAL_INIT_IS_THREADSAFE + +static curl_simple_lock s_lock = CURL_SIMPLE_LOCK_INIT; +#define global_init_lock() curl_simple_lock_lock(&s_lock) +#define global_init_unlock() curl_simple_lock_unlock(&s_lock) + +#else + +#define global_init_lock() +#define global_init_unlock() + +#endif + /* * strdup (and other memory functions) is redefined in complicated * ways, but at this point it must be defined as the system-supplied strdup @@ -207,7 +223,14 @@ static CURLcode global_init(long flags, bool memoryfuncs) */ CURLcode curl_global_init(long flags) { - return global_init(flags, TRUE); + CURLcode result; + global_init_lock(); + + result = global_init(flags, TRUE); + + global_init_unlock(); + + return result; } /* @@ -218,15 +241,20 @@ CURLcode curl_global_init_mem(long flags, curl_malloc_callback m, curl_free_callback f, curl_realloc_callback r, curl_strdup_callback s, curl_calloc_callback c) { + CURLcode result; + /* Invalid input, return immediately */ if(!m || !f || !r || !s || !c) return CURLE_FAILED_INIT; + global_init_lock(); + if(initialized) { /* Already initialized, don't do it again, but bump the variable anyway to work like curl_global_init() and require the same amount of cleanup calls. */ initialized++; + global_init_unlock(); return CURLE_OK; } @@ -239,7 +267,11 @@ CURLcode curl_global_init_mem(long flags, curl_malloc_callback m, Curl_ccalloc = c; /* Call the actual init function, but without setting */ - return global_init(flags, FALSE); + result = global_init(flags, FALSE); + + global_init_unlock(); + + return result; } /** @@ -248,11 +280,17 @@ CURLcode curl_global_init_mem(long flags, curl_malloc_callback m, */ void curl_global_cleanup(void) { - if(!initialized) + global_init_lock(); + + if(!initialized) { + global_init_unlock(); return; + } - if(--initialized) + if(--initialized) { + global_init_unlock(); return; + } Curl_ssl_cleanup(); Curl_resolver_global_cleanup(); @@ -273,6 +311,25 @@ void curl_global_cleanup(void) #endif init_flags = 0; + + global_init_unlock(); +} + +/* + * curl_global_sslset() globally initializes the SSL backend to use. + */ +CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, + const curl_ssl_backend ***avail) +{ + CURLsslset rc; + + global_init_lock(); + + rc = Curl_init_sslset_nolock(id, name, avail); + + global_init_unlock(); + + return rc; } /* @@ -285,14 +342,18 @@ struct Curl_easy *curl_easy_init(void) struct Curl_easy *data; /* Make sure we inited the global SSL stuff */ + global_init_lock(); + if(!initialized) { - result = curl_global_init(CURL_GLOBAL_DEFAULT); + result = global_init(CURL_GLOBAL_DEFAULT, TRUE); if(result) { /* something in the global init failed, return nothing */ DEBUGF(fprintf(stderr, "Error: curl_global_init failed\n")); + global_init_unlock(); return NULL; } } + global_init_unlock(); /* We use curl_open() with undefined URL so far */ result = Curl_open(&data); @@ -507,19 +568,23 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev) /* wait for activity or timeout */ pollrc = Curl_poll(fds, numfds, ev->ms); + if(pollrc < 0) + return CURLE_UNRECOVERABLE_POLL; after = Curl_now(); ev->msbump = FALSE; /* reset here */ - if(0 == pollrc) { + if(!pollrc) { /* timeout! */ ev->ms = 0; /* fprintf(stderr, "call curl_multi_socket_action(TIMEOUT)\n"); */ mcode = curl_multi_socket_action(multi, CURL_SOCKET_TIMEOUT, 0, &ev->running_handles); } - else if(pollrc > 0) { + else { + /* here pollrc is > 0 */ + /* loop over the monitored sockets to see which ones had activity */ for(i = 0; i< numfds; i++) { if(fds[i].revents) { @@ -545,8 +610,6 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev) } } } - else - return CURLE_RECV_ERROR; if(mcode) return CURLE_URL_MALFORMAT; @@ -838,6 +901,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) outcurl->progress.flags = data->progress.flags; outcurl->progress.callback = data->progress.callback; +#ifndef CURL_DISABLE_COOKIES if(data->cookies) { /* If cookies are enabled in the parent handle, we enable them in the clone as well! */ @@ -856,6 +920,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) if(!outcurl->state.cookielist) goto fail; } +#endif if(data->state.url) { outcurl->state.url = strdup(data->state.url); @@ -937,8 +1002,10 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) fail: if(outcurl) { +#ifndef CURL_DISABLE_COOKIES curl_slist_free_all(outcurl->state.cookielist); outcurl->state.cookielist = NULL; +#endif Curl_safefree(outcurl->state.buffer); Curl_dyn_free(&outcurl->state.headerb); Curl_safefree(outcurl->state.url); diff --git a/libs/libcurl/src/easy_lock.h b/libs/libcurl/src/easy_lock.h new file mode 100644 index 0000000000..819f50ce81 --- /dev/null +++ b/libs/libcurl/src/easy_lock.h @@ -0,0 +1,71 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2022, 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" + +#define GLOBAL_INIT_IS_THREADSAFE + +#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600 + +#define curl_simple_lock SRWLOCK +#define CURL_SIMPLE_LOCK_INIT SRWLOCK_INIT + +#define curl_simple_lock_lock(m) AcquireSRWLockExclusive(m) +#define curl_simple_lock_unlock(m) ReleaseSRWLockExclusive(m) + +#elif defined (HAVE_ATOMIC) +#include <stdatomic.h> + +#define curl_simple_lock atomic_bool +#define CURL_SIMPLE_LOCK_INIT false + +static inline void curl_simple_lock_lock(curl_simple_lock *lock) +{ + for(;;) { + if(!atomic_exchange_explicit(lock, true, memory_order_acquire)) + break; + /* Reduce cache coherency traffic */ + while(atomic_load_explicit(lock, memory_order_relaxed)) { + /* Reduce load (not mandatory) */ +#if defined(__i386__) || defined(__x86_64__) + __builtin_ia32_pause(); +#elif defined(__aarch64__) + asm volatile("yield" ::: "memory"); +#elif defined(HAVE_SCHED_YIELD) + sched_yield(); +#endif + } + } +} + +static inline void curl_simple_lock_unlock(curl_simple_lock *lock) +{ + atomic_store_explicit(lock, false, memory_order_release); +} + +#else + +#undef GLOBAL_INIT_IS_THREADSAFE + +#endif diff --git a/libs/libcurl/src/easygetopt.c b/libs/libcurl/src/easygetopt.c index 7b2213fb24..a639bb3758 100644 --- a/libs/libcurl/src/easygetopt.c +++ b/libs/libcurl/src/easygetopt.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * ___|___/|_| ______| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel.se>, et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel.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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/easyif.h b/libs/libcurl/src/easyif.h index 3364418285..615df3f067 100644 --- a/libs/libcurl/src/easyif.h +++ b/libs/libcurl/src/easyif.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/easyoptions.c b/libs/libcurl/src/easyoptions.c index 04871ad1e3..c99f135ffe 100644 --- a/libs/libcurl/src/easyoptions.c +++ b/libs/libcurl/src/easyoptions.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * ___|___/|_| ______| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel.se>, et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel.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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* This source code is generated by optiontable.pl - DO NOT EDIT BY HAND */ @@ -279,6 +281,8 @@ struct curl_easyoption Curl_easyopts[] = { CURLOT_STRING, 0}, {"SSH_KEYDATA", CURLOPT_SSH_KEYDATA, CURLOT_CBPTR, 0}, {"SSH_KEYFUNCTION", CURLOPT_SSH_KEYFUNCTION, CURLOT_FUNCTION, 0}, + {"SSH_HOSTKEYDATA", CURLOPT_SSH_HOSTKEYDATA, CURLOT_CBPTR, 0}, + {"SSH_HOSTKEYFUNCTION", CURLOPT_SSH_HOSTKEYFUNCTION, CURLOT_FUNCTION, 0}, {"SSH_KNOWNHOSTS", CURLOPT_SSH_KNOWNHOSTS, CURLOT_STRING, 0}, {"SSH_PRIVATE_KEYFILE", CURLOPT_SSH_PRIVATE_KEYFILE, CURLOT_STRING, 0}, {"SSH_PUBLIC_KEYFILE", CURLOPT_SSH_PUBLIC_KEYFILE, CURLOT_STRING, 0}, @@ -360,6 +364,6 @@ struct curl_easyoption Curl_easyopts[] = { */ int Curl_easyopts_check(void) { - return ((CURLOPT_LASTENTRY%10000) != (315 + 1)); + return ((CURLOPT_LASTENTRY%10000) != (317 + 1)); } #endif diff --git a/libs/libcurl/src/easyoptions.h b/libs/libcurl/src/easyoptions.h index 91e11908bd..33f816d6b6 100644 --- a/libs/libcurl/src/easyoptions.h +++ b/libs/libcurl/src/easyoptions.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* should probably go into the public header */ diff --git a/libs/libcurl/src/escape.c b/libs/libcurl/src/escape.c index ff5887508e..650e40932c 100644 --- a/libs/libcurl/src/escape.c +++ b/libs/libcurl/src/escape.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* Escape and unescape URL encoding in strings. The functions return a new diff --git a/libs/libcurl/src/escape.h b/libs/libcurl/src/escape.h index 02668835cc..61d4611bf7 100644 --- a/libs/libcurl/src/escape.h +++ b/libs/libcurl/src/escape.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* Escape and unescape URL encoding in strings. The functions return a new * allocated string or NULL if an error occurred. */ diff --git a/libs/libcurl/src/file.c b/libs/libcurl/src/file.c index 3da79a2c1b..40a5e42fa3 100644 --- a/libs/libcurl/src/file.c +++ b/libs/libcurl/src/file.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/file.h b/libs/libcurl/src/file.h index 338f92e46a..826d45380d 100644 --- a/libs/libcurl/src/file.h +++ b/libs/libcurl/src/file.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ diff --git a/libs/libcurl/src/fileinfo.c b/libs/libcurl/src/fileinfo.c index b7e9f0f5e8..7bbf24bdeb 100644 --- a/libs/libcurl/src/fileinfo.c +++ b/libs/libcurl/src/fileinfo.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/fileinfo.h b/libs/libcurl/src/fileinfo.h index 5ae23ad4a3..5bad718cc8 100644 --- a/libs/libcurl/src/fileinfo.h +++ b/libs/libcurl/src/fileinfo.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> diff --git a/libs/libcurl/src/fopen.c b/libs/libcurl/src/fopen.c new file mode 100644 index 0000000000..ad3691ba9d --- /dev/null +++ b/libs/libcurl/src/fopen.c @@ -0,0 +1,113 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2022, 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" + +#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \ + !defined(CURL_DISABLE_HSTS) + +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif + +#include "urldata.h" +#include "rand.h" +#include "fopen.h" +/* The last 3 #include files should be in this order */ +#include "curl_printf.h" +#include "curl_memory.h" +#include "memdebug.h" + +/* + * Curl_fopen() opens a file for writing with a temp name, to be renamed + * to the final name when completed. If there is an existing file using this + * name at the time of the open, this function will clone the mode from that + * file. if 'tempname' is non-NULL, it needs a rename after the file is + * written. + */ +CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, + FILE **fh, char **tempname) +{ + CURLcode result = CURLE_WRITE_ERROR; + unsigned char randsuffix[9]; + char *tempstore = NULL; + struct_stat sb; + int fd = -1; + *tempname = NULL; + + if(stat(filename, &sb) == -1 || !S_ISREG(sb.st_mode)) { + /* a non-regular file, fallback to direct fopen() */ + *fh = fopen(filename, FOPEN_WRITETEXT); + if(*fh) + return CURLE_OK; + goto fail; + } + + result = Curl_rand_hex(data, randsuffix, sizeof(randsuffix)); + if(result) + goto fail; + + tempstore = aprintf("%s.%s.tmp", filename, randsuffix); + if(!tempstore) { + result = CURLE_OUT_OF_MEMORY; + goto fail; + } + + result = CURLE_WRITE_ERROR; + fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, 0600); + if(fd == -1) + goto fail; + +#ifdef HAVE_FCHMOD + { + struct_stat nsb; + if((fstat(fd, &nsb) != -1) && + (nsb.st_uid == sb.st_uid) && (nsb.st_gid == sb.st_gid)) { + /* if the user and group are the same, clone the original mode */ + if(fchmod(fd, sb.st_mode) == -1) + goto fail; + } + } +#endif + + *fh = fdopen(fd, FOPEN_WRITETEXT); + if(!*fh) + goto fail; + + *tempname = tempstore; + return CURLE_OK; + +fail: + if(fd != -1) { + close(fd); + unlink(tempstore); + } + + free(tempstore); + + *tempname = NULL; + return result; +} + +#endif /* ! disabled */ diff --git a/libs/libcurl/src/fopen.h b/libs/libcurl/src/fopen.h new file mode 100644 index 0000000000..289e55f2af --- /dev/null +++ b/libs/libcurl/src/fopen.h @@ -0,0 +1,30 @@ +#ifndef HEADER_CURL_FOPEN_H +#define HEADER_CURL_FOPEN_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2022, 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 + * + ***************************************************************************/ + +CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, + FILE **fh, char **tempname); + +#endif diff --git a/libs/libcurl/src/formdata.c b/libs/libcurl/src/formdata.c index 5fefd7a6ef..f5ed3653df 100644 --- a/libs/libcurl/src/formdata.c +++ b/libs/libcurl/src/formdata.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/formdata.h b/libs/libcurl/src/formdata.h index 09c6e9c28a..c6c6397cd2 100644 --- a/libs/libcurl/src/formdata.h +++ b/libs/libcurl/src/formdata.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/ftp.c b/libs/libcurl/src/ftp.c index 128cdc2f2d..e6e9821c9c 100644 --- a/libs/libcurl/src/ftp.c +++ b/libs/libcurl/src/ftp.c @@ -18,6 +18,8 @@ * 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" @@ -783,8 +785,9 @@ static CURLcode ftp_state_user(struct Curl_easy *data, &conn->proto.ftpc.pp, "USER %s", conn->user?conn->user:""); if(!result) { + struct ftp_conn *ftpc = &conn->proto.ftpc; + ftpc->ftp_trying_alternative = FALSE; state(data, FTP_USER); - data->state.ftp_trying_alternative = FALSE; } return result; } @@ -2622,13 +2625,13 @@ static CURLcode ftp_state_user_resp(struct Curl_easy *data, (the server denies to log the specified user) */ if(data->set.str[STRING_FTP_ALTERNATIVE_TO_USER] && - !data->state.ftp_trying_alternative) { + !ftpc->ftp_trying_alternative) { /* Ok, USER failed. Let's try the supplied command. */ result = Curl_pp_sendf(data, &ftpc->pp, "%s", data->set.str[STRING_FTP_ALTERNATIVE_TO_USER]); if(!result) { - data->state.ftp_trying_alternative = TRUE; + ftpc->ftp_trying_alternative = TRUE; state(data, FTP_USER); } } @@ -2701,10 +2704,11 @@ static CURLcode ftp_statemachine(struct Curl_easy *data, set a valid level */ Curl_sec_request_prot(conn, data->set.str[STRING_KRB_LEVEL]); - if(Curl_sec_login(data, conn)) - infof(data, "Logging in with password in cleartext"); - else - infof(data, "Authentication successful"); + if(Curl_sec_login(data, conn)) { + failf(data, "secure login failed"); + return CURLE_WEIRD_SERVER_REPLY; + } + infof(data, "Authentication successful"); } #endif @@ -3561,8 +3565,10 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep) bool connected = FALSE; bool complete = FALSE; - /* the ftp struct is inited in ftp_connect() */ - struct FTP *ftp = data->req.p.ftp; + /* the ftp struct is inited in ftp_connect(). If we are connecting to an HTTP + * proxy then the state will not be valid until after that connection is + * complete */ + struct FTP *ftp = NULL; /* if the second connection isn't done yet, wait for it */ if(!conn->bits.tcpconnect[SECONDARYSOCKET]) { @@ -3603,6 +3609,9 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep) return result; #endif + /* Curl_proxy_connect might have moved the protocol state */ + ftp = data->req.p.ftp; + if(ftpc->state) { /* already in a state so skip the initial commands. They are only done to kickstart the do_more state */ diff --git a/libs/libcurl/src/ftp.h b/libs/libcurl/src/ftp.h index 1cfdac0851..7f6f4328d1 100644 --- a/libs/libcurl/src/ftp.h +++ b/libs/libcurl/src/ftp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,8 +20,12 @@ * 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" + #include "pingpong.h" #ifndef CURL_DISABLE_FTP @@ -149,6 +153,7 @@ struct ftp_conn { curl_off_t known_filesize; /* file size is different from -1, if wildcard LIST parsing was done and wc_statemach set it */ + BIT(ftp_trying_alternative); }; #define DEFAULT_ACCEPT_TIMEOUT 60000 /* milliseconds == one minute */ diff --git a/libs/libcurl/src/ftplistparser.c b/libs/libcurl/src/ftplistparser.c index 716ff38172..09476e55f4 100644 --- a/libs/libcurl/src/ftplistparser.c +++ b/libs/libcurl/src/ftplistparser.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /** diff --git a/libs/libcurl/src/ftplistparser.h b/libs/libcurl/src/ftplistparser.h index e4cd8201d9..0a80543417 100644 --- a/libs/libcurl/src/ftplistparser.h +++ b/libs/libcurl/src/ftplistparser.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/getenv.c b/libs/libcurl/src/getenv.c index 92c53505c6..5f00fd13a4 100644 --- a/libs/libcurl/src/getenv.c +++ b/libs/libcurl/src/getenv.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/getinfo.c b/libs/libcurl/src/getinfo.c index 9091e6139d..758cf54bbe 100644 --- a/libs/libcurl/src/getinfo.c +++ b/libs/libcurl/src/getinfo.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" @@ -164,6 +166,20 @@ static CURLcode getinfo_char(struct Curl_easy *data, CURLINFO info, case CURLINFO_SCHEME: *param_charp = data->info.conn_scheme; break; + case CURLINFO_CAPATH: +#ifdef CURL_CA_PATH + *param_charp = CURL_CA_PATH; +#else + *param_charp = NULL; +#endif + break; + case CURLINFO_CAINFO: +#ifdef CURL_CA_BUNDLE + *param_charp = CURL_CA_BUNDLE; +#else + *param_charp = NULL; +#endif + break; default: return CURLE_UNKNOWN_OPTION; @@ -285,6 +301,7 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info, /* return if the condition prevented the document to get transferred */ *param_longp = data->info.timecond ? 1L : 0L; break; +#ifndef CURL_DISABLE_RTSP case CURLINFO_RTSP_CLIENT_CSEQ: *param_longp = data->state.rtsp_next_client_CSeq; break; @@ -294,6 +311,7 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info, case CURLINFO_RTSP_CSEQ_RECV: *param_longp = data->state.rtsp_CSeq_recv; break; +#endif case CURLINFO_HTTP_VERSION: switch(data->info.httpversion) { case 10: diff --git a/libs/libcurl/src/getinfo.h b/libs/libcurl/src/getinfo.h index f35d1b4b34..1b5e8c20f8 100644 --- a/libs/libcurl/src/getinfo.h +++ b/libs/libcurl/src/getinfo.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ CURLcode Curl_getinfo(struct Curl_easy *data, CURLINFO info, ...); CURLcode Curl_initinfo(struct Curl_easy *data); diff --git a/libs/libcurl/src/gopher.c b/libs/libcurl/src/gopher.c index 0a3ba8fb56..01f4bdef0c 100644 --- a/libs/libcurl/src/gopher.c +++ b/libs/libcurl/src/gopher.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/gopher.h b/libs/libcurl/src/gopher.h index 6b8bd554a6..4ea269d2b4 100644 --- a/libs/libcurl/src/gopher.h +++ b/libs/libcurl/src/gopher.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_GOPHER diff --git a/libs/libcurl/src/h2h3.c b/libs/libcurl/src/h2h3.c index c0ed58d37a..9453cf55b7 100644 --- a/libs/libcurl/src/h2h3.c +++ b/libs/libcurl/src/h2h3.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/h2h3.h b/libs/libcurl/src/h2h3.h index 22256841c6..84caec5d5e 100644 --- a/libs/libcurl/src/h2h3.h +++ b/libs/libcurl/src/h2h3.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/hash.c b/libs/libcurl/src/hash.c index 8848906947..b6a2a33c72 100644 --- a/libs/libcurl/src/hash.c +++ b/libs/libcurl/src/hash.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/hash.h b/libs/libcurl/src/hash.h index e166916a90..5b59bf1118 100644 --- a/libs/libcurl/src/hash.h +++ b/libs/libcurl/src/hash.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/headers.c b/libs/libcurl/src/headers.c index 226c696be6..154623737a 100644 --- a/libs/libcurl/src/headers.c +++ b/libs/libcurl/src/headers.c @@ -18,6 +18,8 @@ * 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" @@ -32,7 +34,7 @@ #include "curl_memory.h" #include "memdebug.h" -#if !defined(CURL_DISABLE_HTTP) && defined(USE_HEADERS_API) +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API) /* Generate the curl_header struct for the user. This function MUST assign all struct fields in the output struct. */ @@ -216,6 +218,57 @@ static CURLcode namevalue(char *header, size_t hlen, unsigned int type, return CURLE_OK; } +static CURLcode unfold_value(struct Curl_easy *data, const char *value, + size_t vlen) /* length of the incoming header */ +{ + struct Curl_header_store *hs; + struct Curl_header_store *newhs; + size_t olen; /* length of the old value */ + size_t oalloc; /* length of the old name + value + separator */ + size_t offset; + DEBUGASSERT(data->state.prevhead); + hs = data->state.prevhead; + olen = strlen(hs->value); + offset = hs->value - hs->buffer; + oalloc = olen + offset + 1; + + /* skip all trailing space letters */ + while(vlen && ISSPACE(value[vlen - 1])) + vlen--; + + /* save only one leading space */ + while((vlen > 1) && ISSPACE(value[0]) && ISSPACE(value[1])) { + vlen--; + value++; + } + + /* since this header block might move in the realloc below, it needs to + first be unlinked from the list and then re-added again after the + realloc */ + Curl_llist_remove(&data->state.httphdrs, &hs->node, NULL); + + /* new size = struct + new value length + old name+value length */ + newhs = Curl_saferealloc(hs, sizeof(*hs) + vlen + oalloc + 1); + if(!newhs) + return CURLE_OUT_OF_MEMORY; + /* ->name' and ->value point into ->buffer (to keep the header allocation + in a single memory block), which now potentially have moved. Adjust + them. */ + newhs->name = newhs->buffer; + newhs->value = &newhs->buffer[offset]; + + /* put the data at the end of the previous data, not the newline */ + memcpy(&newhs->value[olen], value, vlen); + newhs->value[olen + vlen] = 0; /* zero terminate at newline */ + + /* insert this node into the list of headers */ + Curl_llist_insert_next(&data->state.httphdrs, data->state.httphdrs.tail, + newhs, &newhs->node); + data->state.prevhead = newhs; + return CURLE_OK; +} + + /* * Curl_headers_push() gets passed a full HTTP header to store. It gets called * immediately before the header callback. The header is CRLF terminated. @@ -242,6 +295,15 @@ CURLcode Curl_headers_push(struct Curl_easy *data, const char *header, } hlen = end - header + 1; + if((header[0] == ' ') || (header[0] == '\t')) { + if(data->state.prevhead) + /* line folding, append value to the previous header's value */ + return unfold_value(data, header, hlen); + else + /* can't unfold without a previous header */ + return CURLE_BAD_FUNCTION_ARGUMENT; + } + hs = calloc(1, sizeof(*hs) + hlen); if(!hs) return CURLE_OUT_OF_MEMORY; @@ -260,7 +322,7 @@ CURLcode Curl_headers_push(struct Curl_easy *data, const char *header, /* insert this node into the list of headers */ Curl_llist_insert_next(&data->state.httphdrs, data->state.httphdrs.tail, hs, &hs->node); - + data->state.prevhead = hs; return CURLE_OK; fail: free(hs); diff --git a/libs/libcurl/src/headers.h b/libs/libcurl/src/headers.h index 48c013b04d..96332dbd0b 100644 --- a/libs/libcurl/src/headers.h +++ b/libs/libcurl/src/headers.h @@ -20,10 +20,12 @@ * 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" -#if !defined(CURL_DISABLE_HTTP) && defined(USE_HEADERS_API) +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API) struct Curl_header_store { struct Curl_llist_element node; diff --git a/libs/libcurl/src/hmac.c b/libs/libcurl/src/hmac.c index 85b175d45f..dfb0db5757 100644 --- a/libs/libcurl/src/hmac.c +++ b/libs/libcurl/src/hmac.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC2104 Keyed-Hashing for Message Authentication * ***************************************************************************/ diff --git a/libs/libcurl/src/hostasyn.c b/libs/libcurl/src/hostasyn.c index f7d99ce9a6..0bfbe2ef86 100644 --- a/libs/libcurl/src/hostasyn.c +++ b/libs/libcurl/src/hostasyn.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/hostip.c b/libs/libcurl/src/hostip.c index 7000b85501..1ced9d2e9c 100644 --- a/libs/libcurl/src/hostip.c +++ b/libs/libcurl/src/hostip.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/hostip.h b/libs/libcurl/src/hostip.h index 1db5981842..4b603378bd 100644 --- a/libs/libcurl/src/hostip.h +++ b/libs/libcurl/src/hostip.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/hostip4.c b/libs/libcurl/src/hostip4.c index 1fd791015c..47da6055a9 100644 --- a/libs/libcurl/src/hostip4.c +++ b/libs/libcurl/src/hostip4.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/hostip6.c b/libs/libcurl/src/hostip6.c index c2d5f08e32..d9868628c3 100644 --- a/libs/libcurl/src/hostip6.c +++ b/libs/libcurl/src/hostip6.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/hostsyn.c b/libs/libcurl/src/hostsyn.c index c00c2744c4..ee54363bf9 100644 --- a/libs/libcurl/src/hostsyn.c +++ b/libs/libcurl/src/hostsyn.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/hsts.c b/libs/libcurl/src/hsts.c index b9fa6f7af5..4ba0f30726 100644 --- a/libs/libcurl/src/hsts.c +++ b/libs/libcurl/src/hsts.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* * The Strict-Transport-Security header is defined in RFC 6797: @@ -35,7 +37,7 @@ #include "sendf.h" #include "strtoofft.h" #include "parsedate.h" -#include "rand.h" +#include "fopen.h" #include "rename.h" #include "strtoofft.h" @@ -354,8 +356,7 @@ CURLcode Curl_hsts_save(struct Curl_easy *data, struct hsts *h, struct Curl_llist_element *n; CURLcode result = CURLE_OK; FILE *out; - char *tempstore; - unsigned char randsuffix[9]; + char *tempstore = NULL; if(!h) /* no cache activated */ @@ -369,17 +370,8 @@ CURLcode Curl_hsts_save(struct Curl_easy *data, struct hsts *h, /* marked as read-only, no file or zero length file name */ goto skipsave; - if(Curl_rand_hex(data, randsuffix, sizeof(randsuffix))) - return CURLE_FAILED_INIT; - - tempstore = aprintf("%s.%s.tmp", file, randsuffix); - if(!tempstore) - return CURLE_OUT_OF_MEMORY; - - out = fopen(tempstore, FOPEN_WRITETEXT); - if(!out) - result = CURLE_WRITE_ERROR; - else { + result = Curl_fopen(data, file, &out, &tempstore); + if(!result) { fputs("# Your HSTS cache. https://curl.se/docs/hsts.html\n" "# This file was generated by libcurl! Edit at your own risk.\n", out); @@ -391,10 +383,10 @@ CURLcode Curl_hsts_save(struct Curl_easy *data, struct hsts *h, break; } fclose(out); - if(!result && Curl_rename(tempstore, file)) + if(!result && tempstore && Curl_rename(tempstore, file)) result = CURLE_WRITE_ERROR; - if(result) + if(result && tempstore) unlink(tempstore); } free(tempstore); @@ -494,8 +486,7 @@ static CURLcode hsts_pull(struct Curl_easy *data, struct hsts *h) /* * Load the HSTS cache from the given file. The text based line-oriented file - * format is documented here: - * https://github.com/curl/curl/wiki/HSTS + * format is documented here: https://curl.se/docs/hsts.html * * This function only returns error on major problems that prevent hsts * handling to work completely. It will ignore individual syntactical errors diff --git a/libs/libcurl/src/hsts.h b/libs/libcurl/src/hsts.h index 653c05348d..0e36a7756b 100644 --- a/libs/libcurl/src/hsts.h +++ b/libs/libcurl/src/hsts.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2020 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/http.c b/libs/libcurl/src/http.c index b215307dca..258722a602 100644 --- a/libs/libcurl/src/http.c +++ b/libs/libcurl/src/http.c @@ -18,6 +18,8 @@ * 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" @@ -2709,12 +2711,14 @@ CURLcode Curl_http_bodysend(struct Curl_easy *data, struct connectdata *conn, } #if !defined(CURL_DISABLE_COOKIES) + CURLcode Curl_http_cookies(struct Curl_easy *data, struct connectdata *conn, struct dynbuf *r) { CURLcode result = CURLE_OK; char *addcookies = NULL; + bool linecap = FALSE; if(data->set.str[STRING_COOKIE] && !Curl_checkheaders(data, STRCONST("Cookie"))) addcookies = data->set.str[STRING_COOKIE]; @@ -2732,7 +2736,7 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, !strcmp(host, "127.0.0.1") || !strcmp(host, "[::1]") ? TRUE : FALSE; Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE); - co = Curl_cookie_getlist(data->cookies, host, data->state.up.path, + co = Curl_cookie_getlist(data, data->cookies, host, data->state.up.path, secure_context); Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE); } @@ -2746,6 +2750,13 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, if(result) break; } + if((Curl_dyn_len(r) + strlen(co->name) + strlen(co->value) + 1) >= + MAX_COOKIE_HEADER_LEN) { + infof(data, "Restricted outgoing cookies due to header size, " + "'%s' not sent", co->name); + linecap = TRUE; + break; + } result = Curl_dyn_addf(r, "%s%s=%s", count?"; ":"", co->name, co->value); if(result) @@ -2756,7 +2767,7 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, } Curl_cookie_freelist(store); } - if(addcookies && !result) { + if(addcookies && !result && !linecap) { if(!count) result = Curl_dyn_addn(r, STRCONST("Cookie: ")); if(!result) { @@ -3799,11 +3810,16 @@ static CURLcode verify_header(struct Curl_easy *data) if(k->headerline < 2) /* the first "header" is the status-line and it has no colon */ return CURLE_OK; - ptr = memchr(header, ':', hlen); - if(!ptr) { - /* this is bad, bail out */ - failf(data, "Header without colon"); - return CURLE_WEIRD_SERVER_REPLY; + if(((header[0] == ' ') || (header[0] == '\t')) && k->headerline > 2) + /* line folding, can't happen on line 2 */ + ; + else { + ptr = memchr(header, ':', hlen); + if(!ptr) { + /* this is bad, bail out */ + failf(data, "Header without colon"); + return CURLE_WEIRD_SERVER_REPLY; + } } return CURLE_OK; } diff --git a/libs/libcurl/src/http.h b/libs/libcurl/src/http.h index c4ab3c22de..9eff6b1ff9 100644 --- a/libs/libcurl/src/http.h +++ b/libs/libcurl/src/http.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/http2.c b/libs/libcurl/src/http2.c index 0120b86311..f6364d0e02 100644 --- a/libs/libcurl/src/http2.c +++ b/libs/libcurl/src/http2.c @@ -18,6 +18,8 @@ * 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" @@ -643,7 +645,7 @@ static int push_promise(struct Curl_easy *data, frame->promised_stream_id, newhandle); if(rv) { - infof(data, "failed to set user_data for stream %d", + infof(data, "failed to set user_data for stream %u", frame->promised_stream_id); DEBUGASSERT(0); rv = CURL_PUSH_DENY; @@ -713,19 +715,19 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, data_s = nghttp2_session_get_stream_user_data(session, stream_id); if(!data_s) { H2BUGF(infof(data, - "No Curl_easy associated with stream: %x", + "No Curl_easy associated with stream: %u", stream_id)); return 0; } stream = data_s->req.p.http; if(!stream) { - H2BUGF(infof(data_s, "No proto pointer for stream: %x", + H2BUGF(infof(data_s, "No proto pointer for stream: %u", stream_id)); return NGHTTP2_ERR_CALLBACK_FAILURE; } - H2BUGF(infof(data_s, "on_frame_recv() header %x stream %x", + H2BUGF(infof(data_s, "on_frame_recv() header %x stream %u", frame->hd.type, stream_id)); switch(frame->hd.type) { @@ -913,7 +915,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id, /* remove the entry from the hash as the stream is now gone */ rv = nghttp2_session_set_stream_user_data(session, stream_id, 0); if(rv) { - infof(data_s, "http/2: failed to clear user_data for stream %d", + infof(data_s, "http/2: failed to clear user_data for stream %u", stream_id); DEBUGASSERT(0); } @@ -1050,6 +1052,12 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, else if(stream->push_headers_used == stream->push_headers_alloc) { char **headp; + if(stream->push_headers_alloc > 1000) { + /* this is beyond crazy many headers, bail out */ + failf(data_s, "Too many PUSH_PROMISE headers"); + Curl_safefree(stream->push_headers); + return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; + } stream->push_headers_alloc *= 2; headp = Curl_saferealloc(stream->push_headers, stream->push_headers_alloc * sizeof(char *)); @@ -1240,13 +1248,13 @@ void Curl_http2_done(struct Curl_easy *data, bool premature) /* do this before the reset handling, as that might clear ->stream_id */ if(http->stream_id == httpc->pause_stream_id) { - H2BUGF(infof(data, "DONE the pause stream (%x)", http->stream_id)); + H2BUGF(infof(data, "DONE the pause stream (%u)", http->stream_id)); httpc->pause_stream_id = 0; } if(premature || (!http->closed && http->stream_id)) { /* RST_STREAM */ set_transfer(httpc, data); /* set the transfer */ - H2BUGF(infof(data, "RST stream %x", http->stream_id)); + H2BUGF(infof(data, "RST stream %u", http->stream_id)); if(!nghttp2_submit_rst_stream(httpc->h2, NGHTTP2_FLAG_NONE, http->stream_id, NGHTTP2_STREAM_CLOSED)) (void)nghttp2_session_send(httpc->h2); @@ -1260,7 +1268,7 @@ void Curl_http2_done(struct Curl_easy *data, bool premature) int rv = nghttp2_session_set_stream_user_data(httpc->h2, http->stream_id, 0); if(rv) { - infof(data, "http/2: failed to clear user_data for stream %d", + infof(data, "http/2: failed to clear user_data for stream %u", http->stream_id); DEBUGASSERT(0); } @@ -1519,7 +1527,7 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn, /* Reset to FALSE to prevent infinite loop in readwrite_data function. */ stream->closed = FALSE; if(stream->error == NGHTTP2_REFUSED_STREAM) { - H2BUGF(infof(data, "REFUSED_STREAM (%d), try again on a new connection", + H2BUGF(infof(data, "REFUSED_STREAM (%u), try again on a new connection", stream->stream_id)); connclose(conn, "REFUSED_STREAM"); /* don't use this anymore */ data->state.refused_stream = TRUE; @@ -1527,7 +1535,7 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn, return -1; } else if(stream->error != NGHTTP2_NO_ERROR) { - failf(data, "HTTP/2 stream %d was not closed cleanly: %s (err %u)", + failf(data, "HTTP/2 stream %u was not closed cleanly: %s (err %u)", stream->stream_id, nghttp2_http2_strerror(stream->error), stream->error); *err = CURLE_HTTP2_STREAM; @@ -1535,7 +1543,7 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn, } if(!stream->bodystarted) { - failf(data, "HTTP/2 stream %d was closed cleanly, but before getting " + failf(data, "HTTP/2 stream %u was closed cleanly, but before getting " " all response header fields, treated as error", stream->stream_id); *err = CURLE_HTTP2_STREAM; @@ -1740,7 +1748,7 @@ static ssize_t http2_recv(struct Curl_easy *data, int sockindex, if(stream->closed) /* closed overrides paused */ return 0; - H2BUGF(infof(data, "stream %x is paused, pause id: %x", + H2BUGF(infof(data, "stream %u is paused, pause id: %u", stream->stream_id, httpc->pause_stream_id)); *err = CURLE_AGAIN; return -1; @@ -1771,7 +1779,7 @@ static ssize_t http2_recv(struct Curl_easy *data, int sockindex, /* This will happen when the server or proxy server is SIGKILLed during data transfer. We should emit an error since our data received may be incomplete. */ - failf(data, "HTTP/2 stream %d was not closed cleanly before" + failf(data, "HTTP/2 stream %u was not closed cleanly before" " end of the underlying stream", stream->stream_id); *err = CURLE_HTTP2_STREAM; @@ -1855,7 +1863,7 @@ static ssize_t http2_send(struct Curl_easy *data, int sockindex, if(stream->stream_id != -1) { if(stream->close_handled) { - infof(data, "stream %d closed", stream->stream_id); + infof(data, "stream %u closed", stream->stream_id); *err = CURLE_HTTP2_STREAM; return -1; } @@ -1968,13 +1976,13 @@ static ssize_t http2_send(struct Curl_easy *data, int sockindex, if(stream_id < 0) { H2BUGF(infof(data, - "http2_send() nghttp2_submit_request error (%s)%d", + "http2_send() nghttp2_submit_request error (%s)%u", nghttp2_strerror(stream_id), stream_id)); *err = CURLE_SEND_ERROR; return -1; } - infof(data, "Using Stream ID: %x (easy handle %p)", + infof(data, "Using Stream ID: %u (easy handle %p)", stream_id, (void *)data); stream->stream_id = stream_id; @@ -2094,7 +2102,7 @@ CURLcode Curl_http2_switched(struct Curl_easy *data, stream->stream_id, data); if(rv) { - infof(data, "http/2: failed to set user_data for stream %d", + infof(data, "http/2: failed to set user_data for stream %u", stream->stream_id); DEBUGASSERT(0); } diff --git a/libs/libcurl/src/http2.h b/libs/libcurl/src/http2.h index d6986d97fa..f0390596ce 100644 --- a/libs/libcurl/src/http2.h +++ b/libs/libcurl/src/http2.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/http_aws_sigv4.c b/libs/libcurl/src/http_aws_sigv4.c index 210c3dbe56..390236bc6c 100644 --- a/libs/libcurl/src/http_aws_sigv4.c +++ b/libs/libcurl/src/http_aws_sigv4.c @@ -18,6 +18,8 @@ * 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" @@ -202,12 +204,12 @@ CURLcode Curl_output_aws_sigv4(struct Curl_easy *data, bool proxy) if(!service) { tmp0 = hostname; tmp1 = strchr(tmp0, '.'); - len = tmp1 - tmp0; - if(!tmp1 || len < 1) { + if(!tmp1) { infof(data, "service missing in parameters or hostname"); ret = CURLE_URL_MALFORMAT; goto fail; } + len = tmp1 - tmp0; service = Curl_memdup(tmp0, len + 1); if(!service) { goto fail; @@ -217,12 +219,12 @@ CURLcode Curl_output_aws_sigv4(struct Curl_easy *data, bool proxy) if(!region) { tmp0 = tmp1 + 1; tmp1 = strchr(tmp0, '.'); - len = tmp1 - tmp0; - if(!tmp1 || len < 1) { + if(!tmp1) { infof(data, "region missing in parameters or hostname"); ret = CURLE_URL_MALFORMAT; goto fail; } + len = tmp1 - tmp0; region = Curl_memdup(tmp0, len + 1); if(!region) { goto fail; diff --git a/libs/libcurl/src/http_aws_sigv4.h b/libs/libcurl/src/http_aws_sigv4.h index 886b31440f..85755e937b 100644 --- a/libs/libcurl/src/http_aws_sigv4.h +++ b/libs/libcurl/src/http_aws_sigv4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/http_chunks.c b/libs/libcurl/src/http_chunks.c index 6bafcd9777..2aeb753939 100644 --- a/libs/libcurl/src/http_chunks.c +++ b/libs/libcurl/src/http_chunks.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/http_chunks.h b/libs/libcurl/src/http_chunks.h index 741a9a3bc3..2cf5507c21 100644 --- a/libs/libcurl/src/http_chunks.h +++ b/libs/libcurl/src/http_chunks.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ struct connectdata; diff --git a/libs/libcurl/src/http_digest.c b/libs/libcurl/src/http_digest.c index 34bb5a8e08..c2472e103b 100644 --- a/libs/libcurl/src/http_digest.c +++ b/libs/libcurl/src/http_digest.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/http_digest.h b/libs/libcurl/src/http_digest.h index 89438d1a1f..eea90b7439 100644 --- a/libs/libcurl/src/http_digest.h +++ b/libs/libcurl/src/http_digest.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/http_negotiate.c b/libs/libcurl/src/http_negotiate.c index 888d3b24a2..0ac4ead097 100644 --- a/libs/libcurl/src/http_negotiate.c +++ b/libs/libcurl/src/http_negotiate.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/http_negotiate.h b/libs/libcurl/src/http_negotiate.h index 2640a3ee01..6e2096c697 100644 --- a/libs/libcurl/src/http_negotiate.h +++ b/libs/libcurl/src/http_negotiate.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO) diff --git a/libs/libcurl/src/http_ntlm.c b/libs/libcurl/src/http_ntlm.c index bb7e5360f9..a1f0f20cbb 100644 --- a/libs/libcurl/src/http_ntlm.c +++ b/libs/libcurl/src/http_ntlm.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/http_ntlm.h b/libs/libcurl/src/http_ntlm.h index 5b4fa00baa..cec63b82c3 100644 --- a/libs/libcurl/src/http_ntlm.h +++ b/libs/libcurl/src/http_ntlm.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/http_proxy.c b/libs/libcurl/src/http_proxy.c index ed08193e1e..a69cff2b3c 100644 --- a/libs/libcurl/src/http_proxy.c +++ b/libs/libcurl/src/http_proxy.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/http_proxy.h b/libs/libcurl/src/http_proxy.h index 67543b589b..1e650ee571 100644 --- a/libs/libcurl/src/http_proxy.h +++ b/libs/libcurl/src/http_proxy.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/idn_win32.c b/libs/libcurl/src/idn_win32.c index 0914e1f25a..dacba01d7a 100644 --- a/libs/libcurl/src/idn_win32.c +++ b/libs/libcurl/src/idn_win32.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/if2ip.c b/libs/libcurl/src/if2ip.c index 1d34531932..c29194878f 100644 --- a/libs/libcurl/src/if2ip.c +++ b/libs/libcurl/src/if2ip.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/if2ip.h b/libs/libcurl/src/if2ip.h index a360d4a0e4..5d15459e98 100644 --- a/libs/libcurl/src/if2ip.h +++ b/libs/libcurl/src/if2ip.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/imap.c b/libs/libcurl/src/imap.c index 817513becf..4b46ef1eff 100644 --- a/libs/libcurl/src/imap.c +++ b/libs/libcurl/src/imap.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC2195 CRAM-MD5 authentication * RFC2595 Using TLS with IMAP, POP3 and ACAP * RFC2831 DIGEST-MD5 authentication diff --git a/libs/libcurl/src/imap.h b/libs/libcurl/src/imap.h index ef6515d8c2..43cc1e98fc 100644 --- a/libs/libcurl/src/imap.h +++ b/libs/libcurl/src/imap.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "pingpong.h" diff --git a/libs/libcurl/src/inet_ntop.c b/libs/libcurl/src/inet_ntop.c index b5f9b808af..024f8da36d 100644 --- a/libs/libcurl/src/inet_ntop.c +++ b/libs/libcurl/src/inet_ntop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 Internet Software Consortium. + * Copyright (C) 1996-2022 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -13,6 +13,8 @@ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * SPDX-License-Identifier: ISC */ /* * Original code by Paul Vixie. "curlified" by Gisle Vanem. diff --git a/libs/libcurl/src/inet_ntop.h b/libs/libcurl/src/inet_ntop.h index 067632aaee..18fbd8ba3a 100644 --- a/libs/libcurl/src/inet_ntop.h +++ b/libs/libcurl/src/inet_ntop.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/inet_pton.c b/libs/libcurl/src/inet_pton.c index ada57af289..47fb77834d 100644 --- a/libs/libcurl/src/inet_pton.c +++ b/libs/libcurl/src/inet_pton.c @@ -1,6 +1,6 @@ /* This is from the BIND 4.9.4 release, modified to compile by itself */ -/* Copyright (c) 1996 - 2021 by Internet Software Consortium. +/* Copyright (c) 2003 - 2022 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,6 +14,8 @@ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. + * + * SPDX-License-Identifier: ISC */ #include "curl_setup.h" diff --git a/libs/libcurl/src/inet_pton.h b/libs/libcurl/src/inet_pton.h index ec1237309f..92ae93ea1f 100644 --- a/libs/libcurl/src/inet_pton.h +++ b/libs/libcurl/src/inet_pton.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/krb5.c b/libs/libcurl/src/krb5.c index 787137c192..517491c465 100644 --- a/libs/libcurl/src/krb5.c +++ b/libs/libcurl/src/krb5.c @@ -5,6 +5,8 @@ * Copyright (c) 2004 - 2022 Daniel Stenberg * All rights reserved. * + * SPDX-License-Identifier: BSD-3-Clause + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -140,11 +142,8 @@ krb5_decode(void *app_data, void *buf, int len, enc.value = buf; enc.length = len; maj = gss_unwrap(&min, *context, &enc, &dec, NULL, NULL); - if(maj != GSS_S_COMPLETE) { - if(len >= 4) - strcpy(buf, "599 "); + if(maj != GSS_S_COMPLETE) return -1; - } memcpy(buf, dec.value, dec.length); len = curlx_uztosi(dec.length); @@ -506,6 +505,7 @@ static CURLcode read_data(struct connectdata *conn, { int len; CURLcode result; + int nread; result = socket_read(fd, &len, sizeof(len)); if(result) @@ -514,7 +514,10 @@ static CURLcode read_data(struct connectdata *conn, if(len) { /* only realloc if there was a length */ len = ntohl(len); - buf->data = Curl_saferealloc(buf->data, len); + if(len > CURL_MAX_INPUT_LENGTH) + len = 0; + else + buf->data = Curl_saferealloc(buf->data, len); } if(!len || !buf->data) return CURLE_OUT_OF_MEMORY; @@ -522,8 +525,11 @@ static CURLcode read_data(struct connectdata *conn, result = socket_read(fd, buf->data, len); if(result) return result; - buf->size = conn->mech->decode(conn->app_data, buf->data, len, - conn->data_prot, conn); + nread = conn->mech->decode(conn->app_data, buf->data, len, + conn->data_prot, conn); + if(nread < 0) + return CURLE_RECV_ERROR; + buf->size = (size_t)nread; buf->index = 0; return CURLE_OK; } diff --git a/libs/libcurl/src/ldap.c b/libs/libcurl/src/ldap.c index 03ea14e1f1..51a32dc964 100644 --- a/libs/libcurl/src/ldap.c +++ b/libs/libcurl/src/ldap.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/libcurl.plist b/libs/libcurl/src/libcurl.plist index f6708bce82..c8bd1ea886 100644 --- a/libs/libcurl/src/libcurl.plist +++ b/libs/libcurl/src/libcurl.plist @@ -15,7 +15,7 @@ <string>se.curl.libcurl</string> <key>CFBundleVersion</key> - <string>7.83.1-DEV</string> + <string>7.84.0-DEV</string> <key>CFBundleName</key> <string>libcurl</string> @@ -27,9 +27,9 @@ <string>????</string> <key>CFBundleShortVersionString</key> - <string>libcurl 7.83.1-DEV</string> + <string>libcurl 7.84.0-DEV</string> <key>CFBundleGetInfoString</key> - <string>libcurl.plist 7.83.1-DEV</string> + <string>libcurl.plist 7.84.0-DEV</string> </dict> </plist> diff --git a/libs/libcurl/src/libcurl.rc b/libs/libcurl/src/libcurl.rc index fde6c8cae1..23134a7102 100644 --- a/libs/libcurl/src/libcurl.rc +++ b/libs/libcurl/src/libcurl.rc @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <winver.h> #include "../include/curl/curlver.h" diff --git a/libs/libcurl/src/llist.c b/libs/libcurl/src/llist.c index e78da7da82..fa2d366cb4 100644 --- a/libs/libcurl/src/llist.c +++ b/libs/libcurl/src/llist.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/llist.h b/libs/libcurl/src/llist.h index ceae2dd1b7..2fcb91ca50 100644 --- a/libs/libcurl/src/llist.h +++ b/libs/libcurl/src/llist.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/makefile.amiga b/libs/libcurl/src/makefile.amiga index 698a8f4deb..b09fee9086 100644 --- a/libs/libcurl/src/makefile.amiga +++ b/libs/libcurl/src/makefile.amiga @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # # libcurl Makefile for AmigaOS ... diff --git a/libs/libcurl/src/makefile.dj b/libs/libcurl/src/makefile.dj index ef1a24a7f5..bb95f2bbfd 100644 --- a/libs/libcurl/src/makefile.dj +++ b/libs/libcurl/src/makefile.dj @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2003 - 2021, Gisle Vanem <gvanem@yahoo.no>. +# Copyright (C) 2003 - 2022, Gisle Vanem <gvanem@yahoo.no>. # Copyright (C) 2003 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which @@ -19,6 +19,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# #*************************************************************************** # diff --git a/libs/libcurl/src/md4.c b/libs/libcurl/src/md4.c index 117cce4fd9..63bade00df 100644 --- a/libs/libcurl/src/md4.c +++ b/libs/libcurl/src/md4.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" @@ -39,7 +41,7 @@ #ifdef USE_WOLFSSL #include <wolfssl/options.h> #ifdef NO_MD4 -#define OPENSSL_NO_MD4 +#define WOLFSSL_NO_MD4 #endif #endif @@ -82,9 +84,11 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) md4_digest(ctx, MD4_DIGEST_SIZE, result); } -#elif (defined(USE_OPENSSL) || defined(USE_WOLFSSL)) && \ - !defined(OPENSSL_NO_MD4) /* When OpenSSL or wolfSSL is available, we use their MD4 functions. */ +#elif defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4) +#include <wolfssl/openssl/md4.h> + +#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) #include <openssl/md4.h> #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ diff --git a/libs/libcurl/src/md5.c b/libs/libcurl/src/md5.c index d2ca240fcd..2164e15ff2 100644 --- a/libs/libcurl/src/md5.c +++ b/libs/libcurl/src/md5.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/memdebug.c b/libs/libcurl/src/memdebug.c index 050c5d4b2f..f35a55fe22 100644 --- a/libs/libcurl/src/memdebug.c +++ b/libs/libcurl/src/memdebug.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/memdebug.h b/libs/libcurl/src/memdebug.h index 8e88cea580..3e41571e27 100644 --- a/libs/libcurl/src/memdebug.h +++ b/libs/libcurl/src/memdebug.h @@ -8,7 +8,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -21,6 +21,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/mime.c b/libs/libcurl/src/mime.c index d6985d39c1..11e614dc32 100644 --- a/libs/libcurl/src/mime.c +++ b/libs/libcurl/src/mime.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/mime.h b/libs/libcurl/src/mime.h index f2fc434c58..fe1a61c060 100644 --- a/libs/libcurl/src/mime.h +++ b/libs/libcurl/src/mime.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/mprintf.c b/libs/libcurl/src/mprintf.c index 13812010b3..f0401a881a 100644 --- a/libs/libcurl/src/mprintf.c +++ b/libs/libcurl/src/mprintf.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * * Purpose: * A merge of Bjorn Reese's format() function and Daniel's dsprintf() @@ -956,9 +958,16 @@ static int dprintf_formatf( *fptr = 0; /* and a final zero termination */ +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" +#endif /* NOTE NOTE NOTE!! Not all sprintf implementations return number of output characters */ (sprintf)(work, formatbuf, p->data.dnum); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif DEBUGASSERT(strlen(work) <= sizeof(work)); for(fptr = work; *fptr; fptr++) OUTCHAR(*fptr); diff --git a/libs/libcurl/src/mqtt.c b/libs/libcurl/src/mqtt.c index 9bcbaa1950..7320747af0 100644 --- a/libs/libcurl/src/mqtt.c +++ b/libs/libcurl/src/mqtt.c @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/mqtt.h b/libs/libcurl/src/mqtt.h index fb52c72326..c400d9b14e 100644 --- a/libs/libcurl/src/mqtt.h +++ b/libs/libcurl/src/mqtt.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2019 - 2020, Björn Stenberg, <bjorn@haxx.se> + * Copyright (C) 2019 - 2022, Björn Stenberg, <bjorn@haxx.se> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_MQTT diff --git a/libs/libcurl/src/multi.c b/libs/libcurl/src/multi.c index 8e58d785a9..e0280447c2 100644 --- a/libs/libcurl/src/multi.c +++ b/libs/libcurl/src/multi.c @@ -18,6 +18,8 @@ * 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" @@ -1312,6 +1314,8 @@ static CURLMcode multi_wait(struct Curl_multi *multi, #else pollrc = Curl_poll(ufds, nfds, timeout_ms); /* wait... */ #endif + if(pollrc < 0) + return CURLM_UNRECOVERABLE_POLL; if(pollrc > 0) { retcode = pollrc; diff --git a/libs/libcurl/src/multihandle.h b/libs/libcurl/src/multihandle.h index db7f130efd..76a67a89a0 100644 --- a/libs/libcurl/src/multihandle.h +++ b/libs/libcurl/src/multihandle.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "llist.h" diff --git a/libs/libcurl/src/multiif.h b/libs/libcurl/src/multiif.h index 5a8c358bc4..e0aa00b05e 100644 --- a/libs/libcurl/src/multiif.h +++ b/libs/libcurl/src/multiif.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/netrc.c b/libs/libcurl/src/netrc.c index 0a4ae2cdca..83fe6a7e09 100644 --- a/libs/libcurl/src/netrc.c +++ b/libs/libcurl/src/netrc.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" @@ -78,24 +80,80 @@ static int parsenetrc(const char *host, file = fopen(netrcfile, FOPEN_READTEXT); if(file) { - char *tok; - char *tok_buf; bool done = FALSE; char netrcbuffer[4096]; int netrcbuffsize = (int)sizeof(netrcbuffer); while(!done && fgets(netrcbuffer, netrcbuffsize, file)) { + char *tok; + char *tok_end; + bool quoted; if(state == MACDEF) { if((netrcbuffer[0] == '\n') || (netrcbuffer[0] == '\r')) state = NOTHING; else continue; } - tok = strtok_r(netrcbuffer, " \t\n", &tok_buf); - if(tok && *tok == '#') - /* treat an initial hash as a comment line */ - continue; + tok = netrcbuffer; while(tok) { + while(ISSPACE(*tok)) + tok++; + /* tok is first non-space letter */ + if(!*tok || (*tok == '#')) + /* end of line or the rest is a comment */ + break; + + /* leading double-quote means quoted string */ + quoted = (*tok == '\"'); + + tok_end = tok; + if(!quoted) { + while(!ISSPACE(*tok_end)) + tok_end++; + *tok_end = 0; + } + else { + bool escape = FALSE; + bool endquote = FALSE; + char *store = tok; + tok_end++; /* pass the leading quote */ + while(*tok_end) { + char s = *tok_end; + if(escape) { + escape = FALSE; + switch(s) { + case 'n': + s = '\n'; + break; + case 'r': + s = '\r'; + break; + case 't': + s = '\t'; + break; + } + } + else if(s == '\\') { + escape = TRUE; + tok_end++; + continue; + } + else if(s == '\"') { + tok_end++; /* pass the ending quote */ + endquote = TRUE; + break; + } + *store++ = s; + tok_end++; + } + *store = 0; + if(escape || !endquote) { + /* bad syntax, get out */ + retcode = NETRC_FAILED; + goto out; + } + } + if((login && *login) && (password && *password)) { done = TRUE; break; @@ -183,9 +241,8 @@ static int parsenetrc(const char *host, } break; } /* switch (state) */ - - tok = strtok_r(NULL, " \t\n", &tok_buf); - } /* while(tok) */ + tok = ++tok_end; + } } /* while fgets() */ out: @@ -235,6 +292,9 @@ int Curl_parsenetrc(const char *host, char *filealloc = NULL; if(!netrcfile) { +#if defined(HAVE_GETPWUID_R) && defined(HAVE_GETEUID) + char pwbuf[1024]; +#endif char *home = NULL; char *homea = curl_getenv("HOME"); /* portable environment reader */ if(homea) { @@ -243,7 +303,6 @@ int Curl_parsenetrc(const char *host, } else { struct passwd pw, *pw_res; - char pwbuf[1024]; if(!getpwuid_r(geteuid(), &pw, pwbuf, sizeof(pwbuf), &pw_res) && pw_res) { home = pw.pw_dir; @@ -256,6 +315,13 @@ int Curl_parsenetrc(const char *host, if(pw) { home = pw->pw_dir; } +#elif defined(_WIN32) + } + else { + homea = curl_getenv("USERPROFILE"); + if(homea) { + home = homea; + } #endif } diff --git a/libs/libcurl/src/netrc.h b/libs/libcurl/src/netrc.h index 4938a5916a..53e315b61a 100644 --- a/libs/libcurl/src/netrc.h +++ b/libs/libcurl/src/netrc.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/nonblock.c b/libs/libcurl/src/nonblock.c index 28f6e75881..ce73af31c1 100644 --- a/libs/libcurl/src/nonblock.c +++ b/libs/libcurl/src/nonblock.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/nonblock.h b/libs/libcurl/src/nonblock.h index 761dab4f6d..a42f443a49 100644 --- a/libs/libcurl/src/nonblock.h +++ b/libs/libcurl/src/nonblock.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> /* for curl_socket_t */ diff --git a/libs/libcurl/src/openldap.c b/libs/libcurl/src/openldap.c index 4e92567706..19f2ad9f08 100644 --- a/libs/libcurl/src/openldap.c +++ b/libs/libcurl/src/openldap.c @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/parsedate.c b/libs/libcurl/src/parsedate.c index 3c38f2c4c2..5ed88195fb 100644 --- a/libs/libcurl/src/parsedate.c +++ b/libs/libcurl/src/parsedate.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* A brief summary of the date string formats this parser groks: diff --git a/libs/libcurl/src/parsedate.h b/libs/libcurl/src/parsedate.h index a99faf9e36..4e4347754d 100644 --- a/libs/libcurl/src/parsedate.h +++ b/libs/libcurl/src/parsedate.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ extern const char * const Curl_wkday[7]; diff --git a/libs/libcurl/src/pingpong.c b/libs/libcurl/src/pingpong.c index e08c1d8663..cd55173261 100644 --- a/libs/libcurl/src/pingpong.c +++ b/libs/libcurl/src/pingpong.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * 'pingpong' is for generic back-and-forth support functions used by FTP, * IMAP, POP3, SMTP and whatever more that likes them. * diff --git a/libs/libcurl/src/pingpong.h b/libs/libcurl/src/pingpong.h index 8f56f3f865..cefae073a6 100644 --- a/libs/libcurl/src/pingpong.h +++ b/libs/libcurl/src/pingpong.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/pop3.c b/libs/libcurl/src/pop3.c index 2c1b06c07f..3151a3f56a 100644 --- a/libs/libcurl/src/pop3.c +++ b/libs/libcurl/src/pop3.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC1734 POP3 Authentication * RFC1939 POP3 protocol * RFC2195 CRAM-MD5 authentication diff --git a/libs/libcurl/src/pop3.h b/libs/libcurl/src/pop3.h index 17629ee2df..bb0645f9bf 100644 --- a/libs/libcurl/src/pop3.h +++ b/libs/libcurl/src/pop3.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "pingpong.h" diff --git a/libs/libcurl/src/progress.c b/libs/libcurl/src/progress.c index f5ef6bd526..4a1e1daa81 100644 --- a/libs/libcurl/src/progress.c +++ b/libs/libcurl/src/progress.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/progress.h b/libs/libcurl/src/progress.h index ac4ebc0980..a129315147 100644 --- a/libs/libcurl/src/progress.h +++ b/libs/libcurl/src/progress.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "timeval.h" diff --git a/libs/libcurl/src/psl.c b/libs/libcurl/src/psl.c index e46091863f..60c98a4ca4 100644 --- a/libs/libcurl/src/psl.c +++ b/libs/libcurl/src/psl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/psl.h b/libs/libcurl/src/psl.h index c10367471d..34f0a5cae8 100644 --- a/libs/libcurl/src/psl.h +++ b/libs/libcurl/src/psl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifdef USE_LIBPSL diff --git a/libs/libcurl/src/quic.h b/libs/libcurl/src/quic.h index f92720f5d6..b35774735e 100644 --- a/libs/libcurl/src/quic.h +++ b/libs/libcurl/src/quic.h @@ -20,6 +20,8 @@ * 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" @@ -54,6 +56,7 @@ void Curl_quic_done(struct Curl_easy *data, bool premature); bool Curl_quic_data_pending(const struct Curl_easy *data); void Curl_quic_disconnect(struct Curl_easy *data, struct connectdata *conn, int tempindex); +CURLcode Curl_quic_idle(struct Curl_easy *data); #else /* ENABLE_QUIC */ #define Curl_quic_done_sending(x) diff --git a/libs/libcurl/src/rand.c b/libs/libcurl/src/rand.c index 8da1e8d968..dd02f52680 100644 --- a/libs/libcurl/src/rand.c +++ b/libs/libcurl/src/rand.c @@ -18,6 +18,8 @@ * 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" @@ -71,7 +73,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) /* ---- non-cryptographic version following ---- */ -#ifdef RANDOM_FILE +#if defined(RANDOM_FILE) && !defined(WIN32) if(!seeded) { /* if there's a random file to read a seed from, use it */ int fd = open(RANDOM_FILE, O_RDONLY); @@ -106,7 +108,8 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) * 'rndptr' points to. * * If libcurl is built without TLS support or with a TLS backend that lacks a - * proper random API (Gskit or mbedTLS), this function will use "weak" random. + * proper random API (rustls, Gskit or mbedTLS), this function will use "weak" + * random. * * When built *with* TLS support and a backend that offers strong random, it * will return error if it cannot provide strong random values. diff --git a/libs/libcurl/src/rand.h b/libs/libcurl/src/rand.h index 02d95d8e64..2f442f5816 100644 --- a/libs/libcurl/src/rand.h +++ b/libs/libcurl/src/rand.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/rename.c b/libs/libcurl/src/rename.c index f858d43695..cfb3699fb7 100644 --- a/libs/libcurl/src/rename.c +++ b/libs/libcurl/src/rename.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2020 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "rename.h" diff --git a/libs/libcurl/src/rename.h b/libs/libcurl/src/rename.h index 534f7471c8..9958e2cd23 100644 --- a/libs/libcurl/src/rename.h +++ b/libs/libcurl/src/rename.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2020 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ int Curl_rename(const char *oldpath, const char *newpath); diff --git a/libs/libcurl/src/rtsp.c b/libs/libcurl/src/rtsp.c index 726bfb9ae1..5a6644b26c 100644 --- a/libs/libcurl/src/rtsp.c +++ b/libs/libcurl/src/rtsp.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/rtsp.h b/libs/libcurl/src/rtsp.h index da11ade043..377c828605 100644 --- a/libs/libcurl/src/rtsp.h +++ b/libs/libcurl/src/rtsp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifdef USE_HYPER #define CURL_DISABLE_RTSP 1 diff --git a/libs/libcurl/src/select.c b/libs/libcurl/src/select.c index a48da82bac..c16358d56c 100644 --- a/libs/libcurl/src/select.c +++ b/libs/libcurl/src/select.c @@ -18,6 +18,8 @@ * 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" @@ -352,8 +354,12 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms) value). */ r = our_select(maxfd, &fds_read, &fds_write, &fds_err, timeout_ms); - if(r <= 0) + if(r <= 0) { + if((r == -1) && (SOCKERRNO == EINTR)) + /* make EINTR from select or poll not a "lethal" error */ + r = 0; return r; + } r = 0; for(i = 0; i < nfds; i++) { diff --git a/libs/libcurl/src/select.h b/libs/libcurl/src/select.h index f4bcba30fb..eaff7d9b1c 100644 --- a/libs/libcurl/src/select.h +++ b/libs/libcurl/src/select.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/sendf.c b/libs/libcurl/src/sendf.c index d7d4d8abd4..a210284579 100644 --- a/libs/libcurl/src/sendf.c +++ b/libs/libcurl/src/sendf.c @@ -18,6 +18,8 @@ * 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" @@ -52,7 +54,7 @@ #include "curl_memory.h" #include "memdebug.h" -#ifdef CURL_DO_LINEEND_CONV +#if defined(CURL_DO_LINEEND_CONV) && !defined(CURL_DISABLE_FTP) /* * convert_lineends() changes CRLF (\r\n) end-of-line markers to a single LF * (\n), with special processing for CRLF sequences that are split between two @@ -132,7 +134,7 @@ static size_t convert_lineends(struct Curl_easy *data, } return size; } -#endif /* CURL_DO_LINEEND_CONV */ +#endif /* CURL_DO_LINEEND_CONV && !CURL_DISABLE_FTP */ #ifdef USE_RECV_BEFORE_SEND_WORKAROUND bool Curl_recv_has_postponed_data(struct connectdata *conn, int sockindex) @@ -631,22 +633,15 @@ CURLcode Curl_client_write(struct Curl_easy *data, char *ptr, size_t len) { - struct connectdata *conn = data->conn; - - if(!len) - return CURLE_OK; - +#if !defined(CURL_DISABLE_FTP) && defined(CURL_DO_LINEEND_CONV) /* FTP data may need conversion. */ if((type & CLIENTWRITE_BODY) && - (conn->handler->protocol & PROTO_FAMILY_FTP) && - conn->proto.ftpc.transfertype == 'A') { - -#ifdef CURL_DO_LINEEND_CONV + (data->conn->handler->protocol & PROTO_FAMILY_FTP) && + data->conn->proto.ftpc.transfertype == 'A') { /* convert end-of-line markers */ len = convert_lineends(data, ptr, len); -#endif /* CURL_DO_LINEEND_CONV */ } - +#endif return chop_write(data, type, ptr, len); } diff --git a/libs/libcurl/src/sendf.h b/libs/libcurl/src/sendf.h index 6676003a91..075d70eaad 100644 --- a/libs/libcurl/src/sendf.h +++ b/libs/libcurl/src/sendf.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/setopt.c b/libs/libcurl/src/setopt.c index 05e1a544df..6b16e1c7c8 100644 --- a/libs/libcurl/src/setopt.c +++ b/libs/libcurl/src/setopt.c @@ -18,6 +18,8 @@ * 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" @@ -203,19 +205,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) break; #endif case CURLOPT_RANDOM_FILE: - /* - * This is the path name to a file that contains random data to seed - * the random SSL stuff with. The file is only used for reading. - */ - result = Curl_setstropt(&data->set.str[STRING_SSL_RANDOM_FILE], - va_arg(param, char *)); break; case CURLOPT_EGDSOCKET: - /* - * The Entropy Gathering Daemon socket pathname - */ - result = Curl_setstropt(&data->set.str[STRING_SSL_EGDSOCKET], - va_arg(param, char *)); break; case CURLOPT_MAXCONNECTS: /* @@ -318,7 +309,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) break; case CURLOPT_SERVER_RESPONSE_TIMEOUT: /* - * Option that specifies how quickly an server response must be obtained + * Option that specifies how quickly a server response must be obtained * before it is considered failure. For pingpong protocols. */ arg = va_arg(param, long); @@ -1115,13 +1106,14 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) break; } break; -#endif /* CURL_DISABLE_PROXY */ case CURLOPT_SOCKS5_AUTH: data->set.socks5auth = va_arg(param, unsigned long); if(data->set.socks5auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) result = CURLE_NOT_BUILT_IN; break; +#endif /* CURL_DISABLE_PROXY */ + #if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) case CURLOPT_SOCKS5_GSSAPI_NEC: /* @@ -1404,15 +1396,17 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) data->set.connecttimeout = arg; break; +#ifndef CURL_DISABLE_FTP case CURLOPT_ACCEPTTIMEOUT_MS: /* - * The maximum time you allow curl to wait for server connect + * The maximum time for curl to wait for FTP server connect */ arg = va_arg(param, long); if(arg < 0) return CURLE_BAD_FUNCTION_ARGUMENT; data->set.accepttimeout = arg; break; +#endif case CURLOPT_USERPWD: /* @@ -1612,13 +1606,9 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) * Set data write callback */ data->set.fwrite_func = va_arg(param, curl_write_callback); - if(!data->set.fwrite_func) { - data->set.is_fwrite_set = 0; + if(!data->set.fwrite_func) /* When set to NULL, reset to our internal default function */ data->set.fwrite_func = (curl_write_callback)fwrite; - } - else - data->set.is_fwrite_set = 1; break; case CURLOPT_READFUNCTION: /* @@ -2435,7 +2425,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) #ifdef USE_SSH /* we only include SSH options if explicitly built to support SSH */ case CURLOPT_SSH_AUTH_TYPES: - data->set.ssh_auth_types = va_arg(param, long); + data->set.ssh_auth_types = (unsigned int)va_arg(param, long); break; case CURLOPT_SSH_PUBLIC_KEYFILE: @@ -2478,7 +2468,19 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) result = Curl_setstropt(&data->set.str[STRING_SSH_KNOWNHOSTS], va_arg(param, char *)); break; +#ifdef USE_LIBSSH2 + case CURLOPT_SSH_HOSTKEYFUNCTION: + /* the callback to check the hostkey without the knownhost file */ + data->set.ssh_hostkeyfunc = va_arg(param, curl_sshhostkeycallback); + break; + case CURLOPT_SSH_HOSTKEYDATA: + /* + * Custom client data to pass to the SSH keyfunc callback + */ + data->set.ssh_hostkeyfunc_userp = va_arg(param, void *); + break; +#endif case CURLOPT_SSH_KEYFUNCTION: /* setting to NULL is fine since the ssh.c functions themselves will then revert to use the internal default */ @@ -2523,7 +2525,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) arg = va_arg(param, long); if((arg < 0) || (arg > 0777)) return CURLE_BAD_FUNCTION_ARGUMENT; - data->set.new_file_perms = arg; + data->set.new_file_perms = (unsigned int)arg; break; case CURLOPT_NEW_DIRECTORY_PERMS: @@ -2533,7 +2535,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) arg = va_arg(param, long); if((arg < 0) || (arg > 0777)) return CURLE_BAD_FUNCTION_ARGUMENT; - data->set.new_directory_perms = arg; + data->set.new_directory_perms = (unsigned int)arg; break; #endif @@ -2558,14 +2560,14 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) transfer, which thus helps the app which takes URLs from users or other external inputs and want to restrict what protocol(s) to deal with. Defaults to CURLPROTO_ALL. */ - data->set.allowed_protocols = va_arg(param, long); + data->set.allowed_protocols = (unsigned int)va_arg(param, long); break; case CURLOPT_REDIR_PROTOCOLS: /* set the bitmask for the protocols that libcurl is allowed to follow to, as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs to be set in both bitmasks to be allowed to get redirected to. */ - data->set.redir_protocols = va_arg(param, long); + data->set.redir_protocols = (unsigned int)va_arg(param, long); break; case CURLOPT_DEFAULT_PROTOCOL: @@ -2599,7 +2601,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) #if (!defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_MIME)) || \ !defined(CURL_DISABLE_SMTP) || !defined(CURL_DISABLE_IMAP) case CURLOPT_MIME_OPTIONS: - data->set.mime_options = va_arg(param, long); + data->set.mime_options = (unsigned int)va_arg(param, long); break; #endif @@ -2833,13 +2835,17 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) arg = va_arg(param, long); if(arg < 0) return CURLE_BAD_FUNCTION_ARGUMENT; - data->set.tcp_keepidle = arg; + else if(arg > INT_MAX) + arg = INT_MAX; + data->set.tcp_keepidle = (int)arg; break; case CURLOPT_TCP_KEEPINTVL: arg = va_arg(param, long); if(arg < 0) return CURLE_BAD_FUNCTION_ARGUMENT; - data->set.tcp_keepintvl = arg; + else if(arg > INT_MAX) + arg = INT_MAX; + data->set.tcp_keepintvl = (int)arg; break; case CURLOPT_TCP_FASTOPEN: #if defined(CONNECT_DATA_IDEMPOTENT) || defined(MSG_FASTOPEN) || \ diff --git a/libs/libcurl/src/setopt.h b/libs/libcurl/src/setopt.h index affbfd9960..ffc77a71dc 100644 --- a/libs/libcurl/src/setopt.h +++ b/libs/libcurl/src/setopt.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ CURLcode Curl_setstropt(char **charp, const char *s); diff --git a/libs/libcurl/src/setup-os400.h b/libs/libcurl/src/setup-os400.h index 8c97371e4d..6023ca20de 100644 --- a/libs/libcurl/src/setup-os400.h +++ b/libs/libcurl/src/setup-os400.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ diff --git a/libs/libcurl/src/setup-vms.h b/libs/libcurl/src/setup-vms.h index a6710d9076..b570683d78 100644 --- a/libs/libcurl/src/setup-vms.h +++ b/libs/libcurl/src/setup-vms.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* */ diff --git a/libs/libcurl/src/setup-win32.h b/libs/libcurl/src/setup-win32.h index fa8742f3b1..c16928db90 100644 --- a/libs/libcurl/src/setup-win32.h +++ b/libs/libcurl/src/setup-win32.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/sha256.c b/libs/libcurl/src/sha256.c index 1e879f60f6..60720f5b13 100644 --- a/libs/libcurl/src/sha256.c +++ b/libs/libcurl/src/sha256.c @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/share.c b/libs/libcurl/src/share.c index 403563fdd6..8b18360624 100644 --- a/libs/libcurl/src/share.c +++ b/libs/libcurl/src/share.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/share.h b/libs/libcurl/src/share.h index 222e34ba6e..32be41691a 100644 --- a/libs/libcurl/src/share.h +++ b/libs/libcurl/src/share.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/sigpipe.h b/libs/libcurl/src/sigpipe.h index d6ec5fca3c..d12b31764d 100644 --- a/libs/libcurl/src/sigpipe.h +++ b/libs/libcurl/src/sigpipe.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/slist.c b/libs/libcurl/src/slist.c index 907c203f38..6c80722c77 100644 --- a/libs/libcurl/src/slist.c +++ b/libs/libcurl/src/slist.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/slist.h b/libs/libcurl/src/slist.h index 3114259cfe..4e5834c90a 100644 --- a/libs/libcurl/src/slist.h +++ b/libs/libcurl/src/slist.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/smb.c b/libs/libcurl/src/smb.c index 8f44704a2c..039d680041 100644 --- a/libs/libcurl/src/smb.c +++ b/libs/libcurl/src/smb.c @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/smb.h b/libs/libcurl/src/smb.h index 0e3c2ec112..919f3ac142 100644 --- a/libs/libcurl/src/smb.h +++ b/libs/libcurl/src/smb.h @@ -7,8 +7,8 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2014, Bill Nagel <wnagel@tycoint.com>, Exacq Technologies - * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018, Bill Nagel <wnagel@tycoint.com>, Exacq Technologies + * Copyright (C) 2018 - 2022, 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 @@ -21,6 +21,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ enum smb_conn_state { diff --git a/libs/libcurl/src/smtp.c b/libs/libcurl/src/smtp.c index c736cfae19..6ebb41af66 100644 --- a/libs/libcurl/src/smtp.c +++ b/libs/libcurl/src/smtp.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC1870 SMTP Service Extension for Message Size * RFC2195 CRAM-MD5 authentication * RFC2831 DIGEST-MD5 authentication @@ -1818,7 +1820,9 @@ static CURLcode smtp_parse_address(struct Curl_easy *data, const char *fqma, return result; } -CURLcode Curl_smtp_escape_eob(struct Curl_easy *data, const ssize_t nread) +CURLcode Curl_smtp_escape_eob(struct Curl_easy *data, + const ssize_t nread, + const ssize_t offset) { /* When sending a SMTP payload we must detect CRLF. sequences making sure they are sent as CRLF.. instead, as a . on the beginning of a line will @@ -1852,7 +1856,9 @@ CURLcode Curl_smtp_escape_eob(struct Curl_easy *data, const ssize_t nread) /* This loop can be improved by some kind of Boyer-Moore style of approach but that is saved for later... */ - for(i = 0, si = 0; i < nread; i++) { + if(offset) + memcpy(scratch, data->req.upload_fromhere, offset); + for(i = offset, si = offset; i < nread; i++) { if(SMTP_EOB[smtp->eob] == data->req.upload_fromhere[i]) { smtp->eob++; diff --git a/libs/libcurl/src/smtp.h b/libs/libcurl/src/smtp.h index 1fe45346ee..24c5589e43 100644 --- a/libs/libcurl/src/smtp.h +++ b/libs/libcurl/src/smtp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2009 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2009 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "pingpong.h" @@ -91,6 +93,8 @@ extern const struct Curl_handler Curl_handler_smtps; #define SMTP_EOB_REPL "\x0d\x0a\x2e\x2e" #define SMTP_EOB_REPL_LEN 4 -CURLcode Curl_smtp_escape_eob(struct Curl_easy *data, const ssize_t nread); +CURLcode Curl_smtp_escape_eob(struct Curl_easy *data, + const ssize_t nread, + const ssize_t offset); #endif /* HEADER_CURL_SMTP_H */ diff --git a/libs/libcurl/src/sockaddr.h b/libs/libcurl/src/sockaddr.h index 84c08d9bb5..77ec833ee0 100644 --- a/libs/libcurl/src/sockaddr.h +++ b/libs/libcurl/src/sockaddr.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/socketpair.c b/libs/libcurl/src/socketpair.c index 409d2ad667..0f8798f087 100644 --- a/libs/libcurl/src/socketpair.c +++ b/libs/libcurl/src/socketpair.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2019 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2019 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/socketpair.h b/libs/libcurl/src/socketpair.h index cdcc0b921e..f91a3c6511 100644 --- a/libs/libcurl/src/socketpair.h +++ b/libs/libcurl/src/socketpair.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2019 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2019 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/socks.c b/libs/libcurl/src/socks.c index d614ae59c6..52c29880a6 100644 --- a/libs/libcurl/src/socks.c +++ b/libs/libcurl/src/socks.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/socks.h b/libs/libcurl/src/socks.h index f30c610a86..ff83aa5614 100644 --- a/libs/libcurl/src/socks.h +++ b/libs/libcurl/src/socks.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/socks_gssapi.c b/libs/libcurl/src/socks_gssapi.c index 8ef2f8f374..f14099febf 100644 --- a/libs/libcurl/src/socks_gssapi.c +++ b/libs/libcurl/src/socks_gssapi.c @@ -5,8 +5,8 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. - * Copyright (C) 2009, Markus Moeller, <markus_moeller@compuserve.com> + * Copyright (C) 2012 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012, Markus Moeller, <markus_moeller@compuserve.com> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -19,6 +19,8 @@ * 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" @@ -51,7 +53,7 @@ static int check_gss_err(struct Curl_easy *data, if(GSS_ERROR(major_status)) { OM_uint32 maj_stat, min_stat; OM_uint32 msg_ctx = 0; - gss_buffer_desc status_string; + gss_buffer_desc status_string = GSS_C_EMPTY_BUFFER; char buf[1024]; size_t len; diff --git a/libs/libcurl/src/socks_sspi.c b/libs/libcurl/src/socks_sspi.c index ffc8703468..210a0dfbc5 100644 --- a/libs/libcurl/src/socks_sspi.c +++ b/libs/libcurl/src/socks_sspi.c @@ -5,8 +5,8 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. - * Copyright (C) 2009, 2011, Markus Moeller, <markus_moeller@compuserve.com> + * Copyright (C) 2012 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012, 2011, Markus Moeller, <markus_moeller@compuserve.com> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/speedcheck.c b/libs/libcurl/src/speedcheck.c index 841d256b48..3ddc43d2de 100644 --- a/libs/libcurl/src/speedcheck.c +++ b/libs/libcurl/src/speedcheck.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/speedcheck.h b/libs/libcurl/src/speedcheck.h index 1d4c7bfeff..cb44eb04ec 100644 --- a/libs/libcurl/src/speedcheck.h +++ b/libs/libcurl/src/speedcheck.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/splay.c b/libs/libcurl/src/splay.c index bcc0795212..e7d86f1aac 100644 --- a/libs/libcurl/src/splay.c +++ b/libs/libcurl/src/splay.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1997 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1997 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/splay.h b/libs/libcurl/src/splay.h index eb9f65f1e0..015e2ca52f 100644 --- a/libs/libcurl/src/splay.h +++ b/libs/libcurl/src/splay.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1997 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1997 - 2022, 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 @@ -20,6 +20,8 @@ * 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" #include "timeval.h" diff --git a/libs/libcurl/src/strcase.c b/libs/libcurl/src/strcase.c index 692a3f14ae..f932485204 100644 --- a/libs/libcurl/src/strcase.c +++ b/libs/libcurl/src/strcase.c @@ -18,6 +18,8 @@ * 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" @@ -28,13 +30,50 @@ static char raw_tolower(char in); +/* Mapping table to go from lowercase to uppercase for plain ASCII.*/ +static const unsigned char touppermap[256] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, +22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, +41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, +60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, +79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 65, +66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +85, 86, 87, 88, 89, 90, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, +134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, +150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, +166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, +182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, +198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, +214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, +230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, +246, 247, 248, 249, 250, 251, 252, 253, 254, 255 +}; + +/* Mapping table to go from uppercase to lowercase for plain ASCII.*/ +static const unsigned char tolowermap[256] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, +22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, +42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, +62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, +111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95, +96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, +112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, +128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, +144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, +160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, +176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, +192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, +208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, +224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, +240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 +}; + + /* Portable, consistent toupper. Do not use toupper() because its behavior is altered by the current locale. */ char Curl_raw_toupper(char in) { - if(in >= 'a' && in <= 'z') - return (char)('A' + in - 'a'); - return in; + return touppermap[(unsigned char) in]; } @@ -42,9 +81,7 @@ char Curl_raw_toupper(char in) altered by the current locale. */ static char raw_tolower(char in) { - if(in >= 'A' && in <= 'Z') - return (char)('a' + in - 'A'); - return in; + return tolowermap[(unsigned char) in]; } /* @@ -62,14 +99,15 @@ int Curl_strcasecompare(const char *first, const char *second) while(*first && *second) { if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second)) /* get out of the loop as soon as they don't match */ - break; + return 0; first++; second++; } - /* we do the comparison here (possibly again), just to make sure that if the - loop above is skipped because one of the strings reached zero, we must not - return this as a successful match */ - return (Curl_raw_toupper(*first) == Curl_raw_toupper(*second)); + /* If we're here either the strings are the same or the length is different. + We can just test if the "current" character is non-zero for one and zero + for the other. Note that the characters may not be exactly the same even + if they match, we only want to compare zero-ness. */ + return !*first == !*second; } int Curl_safe_strcasecompare(const char *first, const char *second) diff --git a/libs/libcurl/src/strcase.h b/libs/libcurl/src/strcase.h index 2635f5117e..d245929227 100644 --- a/libs/libcurl/src/strcase.h +++ b/libs/libcurl/src/strcase.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> diff --git a/libs/libcurl/src/strdup.c b/libs/libcurl/src/strdup.c index 85cf33b3ed..ac22b6ddaf 100644 --- a/libs/libcurl/src/strdup.c +++ b/libs/libcurl/src/strdup.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/strdup.h b/libs/libcurl/src/strdup.h index 8c8a6f20e1..fb46808b83 100644 --- a/libs/libcurl/src/strdup.h +++ b/libs/libcurl/src/strdup.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/strerror.c b/libs/libcurl/src/strerror.c index 781e26b69f..be43fd6c84 100644 --- a/libs/libcurl/src/strerror.c +++ b/libs/libcurl/src/strerror.c @@ -18,6 +18,8 @@ * 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" @@ -317,6 +319,9 @@ curl_easy_strerror(CURLcode error) case CURLE_SSL_CLIENTCERT: return "SSL Client Certificate required"; + case CURLE_UNRECOVERABLE_POLL: + return "Unrecoverable error in select/poll"; + /* error codes not used by current libcurl */ case CURLE_OBSOLETE20: case CURLE_OBSOLETE24: @@ -400,6 +405,9 @@ curl_multi_strerror(CURLMcode error) case CURLM_ABORTED_BY_CALLBACK: return "Operation was aborted by an application callback"; + case CURLM_UNRECOVERABLE_POLL: + return "Unrecoverable error in select/poll"; + case CURLM_LAST: break; } diff --git a/libs/libcurl/src/strerror.h b/libs/libcurl/src/strerror.h index 96a7e27c51..658f16c10e 100644 --- a/libs/libcurl/src/strerror.h +++ b/libs/libcurl/src/strerror.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "urldata.h" diff --git a/libs/libcurl/src/strtok.c b/libs/libcurl/src/strtok.c index d53e587ab3..6120bcc28e 100644 --- a/libs/libcurl/src/strtok.c +++ b/libs/libcurl/src/strtok.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/strtok.h b/libs/libcurl/src/strtok.h index 831ef0c009..641a3daed8 100644 --- a/libs/libcurl/src/strtok.h +++ b/libs/libcurl/src/strtok.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" #include <stddef.h> diff --git a/libs/libcurl/src/strtoofft.c b/libs/libcurl/src/strtoofft.c index ac87cfc5bd..30908fdd92 100644 --- a/libs/libcurl/src/strtoofft.c +++ b/libs/libcurl/src/strtoofft.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <errno.h> diff --git a/libs/libcurl/src/strtoofft.h b/libs/libcurl/src/strtoofft.h index 4d22ba36c9..311dae4403 100644 --- a/libs/libcurl/src/strtoofft.h +++ b/libs/libcurl/src/strtoofft.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/system_win32.c b/libs/libcurl/src/system_win32.c index 9a6dd9cef6..bede9c7dcd 100644 --- a/libs/libcurl/src/system_win32.c +++ b/libs/libcurl/src/system_win32.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2016 - 2021, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2016 - 2022, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/system_win32.h b/libs/libcurl/src/system_win32.h index 69e0c812c0..167804e3c5 100644 --- a/libs/libcurl/src/system_win32.h +++ b/libs/libcurl/src/system_win32.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2016 - 2020, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2016 - 2022, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/telnet.c b/libs/libcurl/src/telnet.c index 2abfcd952a..923c7f82bd 100644 --- a/libs/libcurl/src/telnet.c +++ b/libs/libcurl/src/telnet.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/telnet.h b/libs/libcurl/src/telnet.h index 1427473a9f..6dd99b48dc 100644 --- a/libs/libcurl/src/telnet.h +++ b/libs/libcurl/src/telnet.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_TELNET extern const struct Curl_handler Curl_handler_telnet; diff --git a/libs/libcurl/src/tftp.c b/libs/libcurl/src/tftp.c index 7f2c88b71e..9e6d9490ed 100644 --- a/libs/libcurl/src/tftp.c +++ b/libs/libcurl/src/tftp.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/tftp.h b/libs/libcurl/src/tftp.h index 4b5bea2757..3f1fda6382 100644 --- a/libs/libcurl/src/tftp.h +++ b/libs/libcurl/src/tftp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef CURL_DISABLE_TFTP extern const struct Curl_handler Curl_handler_tftp; diff --git a/libs/libcurl/src/timediff.c b/libs/libcurl/src/timediff.c index 003477c63c..27fd911638 100644 --- a/libs/libcurl/src/timediff.c +++ b/libs/libcurl/src/timediff.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "timediff.h" diff --git a/libs/libcurl/src/timediff.h b/libs/libcurl/src/timediff.h index fcd5f05636..90e547457f 100644 --- a/libs/libcurl/src/timediff.h +++ b/libs/libcurl/src/timediff.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/timeval.c b/libs/libcurl/src/timeval.c index ca98fe50e5..647d7b0fc5 100644 --- a/libs/libcurl/src/timeval.c +++ b/libs/libcurl/src/timeval.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "timeval.h" diff --git a/libs/libcurl/src/timeval.h b/libs/libcurl/src/timeval.h index dce32f4cde..8d4fef4e17 100644 --- a/libs/libcurl/src/timeval.h +++ b/libs/libcurl/src/timeval.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/transfer.c b/libs/libcurl/src/transfer.c index 315da876c4..1720b24b12 100644 --- a/libs/libcurl/src/transfer.c +++ b/libs/libcurl/src/transfer.c @@ -18,6 +18,8 @@ * 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" @@ -202,6 +204,7 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, } #endif +#ifndef CURL_DISABLE_HTTP /* if we are transmitting trailing data, we don't need to write a chunk size so we skip this */ if(data->req.upload_chunky && @@ -211,7 +214,6 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, data->req.upload_fromhere += (8 + 2); /* 32bit hex + CRLF */ } -#ifndef CURL_DISABLE_HTTP if(data->state.trailers_state == TRAILERS_SENDING) { /* if we're here then that means that we already sent the last empty chunk but we didn't send a final CR LF, so we sent 0 CR LF. We then start @@ -267,6 +269,7 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, return CURLE_READ_ERROR; } +#ifndef CURL_DISABLE_HTTP if(!data->req.forbidchunk && data->req.upload_chunky) { /* if chunked Transfer-Encoding * build chunk: @@ -317,15 +320,12 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, /* always append ASCII CRLF to the data unless we have a valid trailer callback */ -#ifndef CURL_DISABLE_HTTP if((nread-hexlen) == 0 && data->set.trailer_callback != NULL && data->state.trailers_state == TRAILERS_NONE) { data->state.trailers_state = TRAILERS_INITIALIZED; } - else -#endif - { + else { memcpy(data->req.upload_fromhere + nread, endofline_network, strlen(endofline_network)); @@ -333,7 +333,6 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, } } -#ifndef CURL_DISABLE_HTTP if(data->state.trailers_state == TRAILERS_SENDING && !trailers_left(data)) { Curl_dyn_free(&data->state.trailers_buf); @@ -345,7 +344,6 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, infof(data, "Signaling end of chunked upload after trailers."); } else -#endif if((nread - hexlen) == 0 && data->state.trailers_state != TRAILERS_INITIALIZED) { /* mark this as done once this chunk is transferred */ @@ -357,6 +355,7 @@ CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes, if(added_crlf) nread += strlen(endofline_network); /* for the added end of line */ } +#endif *nreadp = nread; @@ -900,6 +899,9 @@ static void win_update_buffer_size(curl_socket_t sockfd) #define win_update_buffer_size(x) #endif +#define curl_upload_refill_watermark(data) \ + ((ssize_t)((data)->set.upload_buffer_size >> 5)) + /* * Send data to upload to the server, when the socket is writable. */ @@ -921,13 +923,25 @@ static CURLcode readwrite_upload(struct Curl_easy *data, do { curl_off_t nbody; + ssize_t offset = 0; + + if(0 != k->upload_present && + k->upload_present < curl_upload_refill_watermark(data) && + !k->upload_chunky &&/*(variable sized chunked header; append not safe)*/ + !k->upload_done && /*!(k->upload_done once k->upload_present sent)*/ + !(k->writebytecount + k->upload_present - k->pendingheader == + data->state.infilesize)) { + offset = k->upload_present; + } /* only read more data if there's no upload data already - present in the upload buffer */ - if(0 == k->upload_present) { + present in the upload buffer, or if appending to upload buffer */ + if(0 == k->upload_present || offset) { result = Curl_get_upload_buffer(data); if(result) return result; + if(offset && k->upload_fromhere != data->state.ulbuf) + memmove(data->state.ulbuf, k->upload_fromhere, offset); /* init the "upload from here" pointer */ k->upload_fromhere = data->state.ulbuf; @@ -960,12 +974,14 @@ static CURLcode readwrite_upload(struct Curl_easy *data, sending_http_headers = FALSE; } - result = Curl_fillreadbuffer(data, data->set.upload_buffer_size, + k->upload_fromhere += offset; + result = Curl_fillreadbuffer(data, data->set.upload_buffer_size-offset, &fillcount); + k->upload_fromhere -= offset; if(result) return result; - nread = fillcount; + nread = offset + fillcount; } else nread = 0; /* we're done uploading/reading */ @@ -1007,7 +1023,9 @@ static CURLcode readwrite_upload(struct Curl_easy *data, * That means the hex values for ASCII CR (0x0d) & LF (0x0a) * must be used instead of the escape sequences \r & \n. */ - for(i = 0, si = 0; i < nread; i++, si++) { + if(offset) + memcpy(data->state.scratch, k->upload_fromhere, offset); + for(i = offset, si = offset; i < nread; i++, si++) { if(k->upload_fromhere[i] == 0x0a) { data->state.scratch[si++] = 0x0d; data->state.scratch[si] = 0x0a; @@ -1037,12 +1055,12 @@ static CURLcode readwrite_upload(struct Curl_easy *data, #ifndef CURL_DISABLE_SMTP if(conn->handler->protocol & PROTO_FAMILY_SMTP) { - result = Curl_smtp_escape_eob(data, nread); + result = Curl_smtp_escape_eob(data, nread, offset); if(result) return result; } #endif /* CURL_DISABLE_SMTP */ - } /* if 0 == k->upload_present */ + } /* if 0 == k->upload_present or appended to upload buffer */ else { /* We have a partial buffer left from a previous "round". Use that instead of reading more data */ @@ -1153,10 +1171,12 @@ CURLcode Curl_readwrite(struct connectdata *conn, else fd_write = CURL_SOCKET_BAD; +#if defined(USE_HTTP2) || defined(USE_HTTP3) if(data->state.drain) { select_res |= CURL_CSELECT_IN; DEBUGF(infof(data, "Curl_readwrite: forcibly told to drain data")); } +#endif if(!select_res) /* Call for select()/poll() only, if read/write/error status is not known. */ @@ -1222,6 +1242,14 @@ CURLcode Curl_readwrite(struct connectdata *conn, infof(data, "Done waiting for 100-continue"); } } + +#ifdef ENABLE_QUIC + if(conn->transport == TRNSPRT_QUIC) { + result = Curl_quic_idle(data); + if(result) + return result; + } +#endif } if(Curl_pgrsUpdate(data)) @@ -1394,7 +1422,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) if(result) return result; - data->state.wildcardmatch = data->set.wildcard_enabled; data->state.followlocation = 0; /* reset the location-follow counter */ data->state.this_is_a_follow = FALSE; /* reset this */ data->state.errorbuf = FALSE; /* no error has occurred */ @@ -1416,10 +1443,11 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) else data->state.infilesize = 0; +#ifndef CURL_DISABLE_COOKIES /* If there is a list of cookie files to read, do it now! */ if(data->state.cookielist) Curl_cookie_loadfiles(data); - +#endif /* If there is a list of host pairs to deal with */ if(data->state.resolve) result = Curl_loadhostpairs(data); @@ -1449,6 +1477,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) data->state.authproxy.picked &= data->state.authproxy.want; #ifndef CURL_DISABLE_FTP + data->state.wildcardmatch = data->set.wildcard_enabled; if(data->state.wildcardmatch) { struct WildcardData *wc = &data->wildcard; if(wc->state < CURLWC_INIT) { @@ -1562,7 +1591,7 @@ CURLcode Curl_follow(struct Curl_easy *data, data->state.referer_alloc = FALSE; } - /* Make a copy of the URL without crenditals and fragment */ + /* Make a copy of the URL without credentials and fragment */ u = curl_url(); if(!u) return CURLE_OUT_OF_MEMORY; @@ -1599,7 +1628,8 @@ CURLcode Curl_follow(struct Curl_easy *data, uc = curl_url_set(data->state.uh, CURLUPART_URL, newurl, (type == FOLLOW_FAKE) ? CURLU_NON_SUPPORT_SCHEME : ((type == FOLLOW_REDIR) ? CURLU_URLENCODE : 0) | - CURLU_ALLOW_SPACE); + CURLU_ALLOW_SPACE | + (data->set.path_as_is ? CURLU_PATH_AS_IS : 0)); if(uc) { if(type != FOLLOW_FAKE) return Curl_uc_to_curlcode(uc); @@ -1813,10 +1843,12 @@ CURLcode Curl_retry_request(struct Curl_easy *data, char **url) return CURLE_OK; if((data->req.bytecount + data->req.headerbytecount == 0) && - conn->bits.reuse && - (!data->set.opt_no_body - || (conn->handler->protocol & PROTO_FAMILY_HTTP)) && - (data->set.rtspreq != RTSPREQ_RECEIVE)) + conn->bits.reuse && + (!data->set.opt_no_body || (conn->handler->protocol & PROTO_FAMILY_HTTP)) +#ifndef CURL_DISABLE_RTSP + && (data->set.rtspreq != RTSPREQ_RECEIVE) +#endif + ) /* We got no data, we attempted to re-use a connection. For HTTP this can be a retry so we try again regardless if we expected a body. For other protocols we only try again only if we expected a body. @@ -1888,11 +1920,14 @@ Curl_setup_transfer( struct SingleRequest *k = &data->req; struct connectdata *conn = data->conn; struct HTTP *http = data->req.p.http; - bool httpsending = ((conn->handler->protocol&PROTO_FAMILY_HTTP) && - (http->sending == HTTPSEND_REQUEST)); + bool httpsending; + DEBUGASSERT(conn != NULL); DEBUGASSERT((sockindex <= 1) && (sockindex >= -1)); + httpsending = ((conn->handler->protocol&PROTO_FAMILY_HTTP) && + (http->sending == HTTPSEND_REQUEST)); + if(conn->bits.multiplex || conn->httpversion == 20 || httpsending) { /* when multiplexing, the read/write sockets need to be the same! */ conn->sockfd = sockindex == -1 ? diff --git a/libs/libcurl/src/transfer.h b/libs/libcurl/src/transfer.h index 56d2fd1ee3..65fe68e812 100644 --- a/libs/libcurl/src/transfer.h +++ b/libs/libcurl/src/transfer.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #define Curl_headersep(x) ((((x)==':') || ((x)==';'))) diff --git a/libs/libcurl/src/url.c b/libs/libcurl/src/url.c index 6b31d4b131..1114c6c12e 100644 --- a/libs/libcurl/src/url.c +++ b/libs/libcurl/src/url.c @@ -18,6 +18,8 @@ * 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" @@ -147,6 +149,10 @@ static void conn_free(struct connectdata *conn); # error READBUFFER_SIZE is too small #endif +#ifdef USE_UNIX_SOCKETS +#define UNIX_SOCKET_PREFIX "localhost" +#endif + /* * get_protocol_family() * @@ -495,7 +501,6 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) /* use fread as default function to read input */ set->fread_func_set = (curl_read_callback)fread; set->is_fread_set = 0; - set->is_fwrite_set = 0; set->seek_func = ZERO_NULL; set->seek_client = ZERO_NULL; @@ -505,7 +510,9 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) set->maxredirs = -1; /* allow any amount by default */ set->method = HTTPREQ_GET; /* Default HTTP request */ +#ifndef CURL_DISABLE_RTSP set->rtspreq = RTSPREQ_OPTIONS; /* Default RTSP request */ +#endif #ifndef CURL_DISABLE_FTP set->ftp_use_epsv = TRUE; /* FTP defaults to EPSV operations */ set->ftp_use_eprt = TRUE; /* FTP defaults to EPRT operations */ @@ -521,10 +528,12 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) set->proxyport = 0; set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */ set->httpauth = CURLAUTH_BASIC; /* defaults to basic */ - set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */ +#ifndef CURL_DISABLE_PROXY + set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */ /* SOCKS5 proxy auth defaults to username/password + GSS-API */ set->socks5auth = CURLAUTH_BASIC | CURLAUTH_GSSAPI; +#endif /* make libcurl quiet by default: */ set->hide_progress = TRUE; /* CURLOPT_NOPROGRESS changes these */ @@ -544,8 +553,8 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) #ifdef USE_TLS_SRP set->ssl.primary.authtype = CURL_TLSAUTH_NONE; #endif - set->ssh_auth_types = CURLSSH_AUTH_DEFAULT; /* defaults to any auth - type */ + /* defaults to any auth type */ + set->ssh_auth_types = CURLSSH_AUTH_DEFAULT; set->ssl.primary.sessionid = TRUE; /* session ID caching enabled by default */ #ifndef CURL_DISABLE_PROXY @@ -558,7 +567,7 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) /* for the *protocols fields we don't use the CURLPROTO_ALL convenience define since we internally only use the lower 16 bits for the passed in bitmask to not conflict with the private bits */ - set->allowed_protocols = CURLPROTO_ALL; + set->allowed_protocols = (unsigned int)CURLPROTO_ALL; set->redir_protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP | CURLPROTO_FTPS; @@ -598,9 +607,12 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) #endif } +#ifndef CURL_DISABLE_FTP set->wildcard_enabled = FALSE; set->chunk_bgn = ZERO_NULL; set->chunk_end = ZERO_NULL; + set->fnmatch = ZERO_NULL; +#endif set->tcp_keepalive = FALSE; set->tcp_keepintvl = 60; set->tcp_keepidle = 60; @@ -613,7 +625,6 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) set->buffer_size = READBUFFER_SIZE; set->upload_buffer_size = UPLOADBUFFER_DEFAULT; set->happy_eyeballs_timeout = CURL_HET_DEFAULT; - set->fnmatch = ZERO_NULL; set->upkeep_interval_ms = CURL_UPKEEP_INTERVAL_DEFAULT; set->maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */ set->maxage_conn = 118; @@ -1100,12 +1111,17 @@ static void prune_dead_connections(struct Curl_easy *data) } } +#ifdef USE_SSH static bool ssh_config_matches(struct connectdata *one, struct connectdata *two) { return (Curl_safecmp(one->proto.sshc.rsa, two->proto.sshc.rsa) && Curl_safecmp(one->proto.sshc.rsa_pub, two->proto.sshc.rsa_pub)); } +#else +#define ssh_config_matches(x,y) FALSE +#endif + /* * Given one filled in connection struct (named needle), this function should * detect if there already is one that has all the significant details @@ -1770,16 +1786,12 @@ static struct connectdata *allocate_conn(struct Curl_easy *data) conn->ssl_config.verifypeer = data->set.ssl.primary.verifypeer; conn->ssl_config.verifyhost = data->set.ssl.primary.verifyhost; conn->ssl_config.ssl_options = data->set.ssl.primary.ssl_options; -#ifdef USE_TLS_SRP -#endif #ifndef CURL_DISABLE_PROXY conn->proxy_ssl_config.verifystatus = data->set.proxy_ssl.primary.verifystatus; conn->proxy_ssl_config.verifypeer = data->set.proxy_ssl.primary.verifypeer; conn->proxy_ssl_config.verifyhost = data->set.proxy_ssl.primary.verifyhost; conn->proxy_ssl_config.ssl_options = data->set.proxy_ssl.primary.ssl_options; -#ifdef USE_TLS_SRP -#endif #endif conn->ip_version = data->set.ipver; conn->bits.connect_only = data->set.connect_only; @@ -2101,7 +2113,8 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, else if(uc != CURLUE_NO_OPTIONS) return Curl_uc_to_curlcode(uc); - uc = curl_url_get(uh, CURLUPART_PATH, &data->state.up.path, 0); + uc = curl_url_get(uh, CURLUPART_PATH, &data->state.up.path, + CURLU_URLENCODE); if(uc) return Curl_uc_to_curlcode(uc); @@ -2411,13 +2424,18 @@ static CURLcode parse_proxy(struct Curl_easy *data, int port = -1; char *proxyuser = NULL; char *proxypasswd = NULL; - char *host; + char *host = NULL; bool sockstype; CURLUcode uc; struct proxy_info *proxyinfo; CURLU *uhp = curl_url(); CURLcode result = CURLE_OK; char *scheme = NULL; +#ifdef USE_UNIX_SOCKETS + char *path = NULL; + bool is_unix_proxy = FALSE; +#endif + if(!uhp) { result = CURLE_OUT_OF_MEMORY; @@ -2542,21 +2560,54 @@ static CURLcode parse_proxy(struct Curl_easy *data, result = CURLE_OUT_OF_MEMORY; goto error; } - Curl_safefree(proxyinfo->host.rawalloc); - proxyinfo->host.rawalloc = host; - if(host[0] == '[') { - /* this is a numerical IPv6, strip off the brackets */ - size_t len = strlen(host); - host[len-1] = 0; /* clear the trailing bracket */ - host++; - zonefrom_url(uhp, data, conn); +#ifdef USE_UNIX_SOCKETS + if(sockstype && strcasecompare(UNIX_SOCKET_PREFIX, host)) { + uc = curl_url_get(uhp, CURLUPART_PATH, &path, CURLU_URLDECODE); + if(uc) { + result = CURLE_OUT_OF_MEMORY; + goto error; + } + /* path will be "/", if no path was was found */ + if(strcmp("/", path)) { + is_unix_proxy = TRUE; + free(host); + host = aprintf(UNIX_SOCKET_PREFIX"%s", path); + if(!host) { + result = CURLE_OUT_OF_MEMORY; + goto error; + } + Curl_safefree(proxyinfo->host.rawalloc); + proxyinfo->host.rawalloc = host; + proxyinfo->host.name = host; + host = NULL; + } + } + + if(!is_unix_proxy) { +#endif + Curl_safefree(proxyinfo->host.rawalloc); + proxyinfo->host.rawalloc = host; + if(host[0] == '[') { + /* this is a numerical IPv6, strip off the brackets */ + size_t len = strlen(host); + host[len-1] = 0; /* clear the trailing bracket */ + host++; + zonefrom_url(uhp, data, conn); + } + proxyinfo->host.name = host; + host = NULL; +#ifdef USE_UNIX_SOCKETS } - proxyinfo->host.name = host; +#endif error: free(proxyuser); free(proxypasswd); + free(host); free(scheme); +#ifdef USE_UNIX_SOCKETS + free(path); +#endif curl_url_cleanup(uhp); return result; } @@ -2973,7 +3024,8 @@ static CURLcode override_login(struct Curl_easy *data, conn->host.name, data->set.str[STRING_NETRC_FILE]); } else if(ret < 0) { - return CURLE_OUT_OF_MEMORY; + failf(data, ".netrc parser error"); + return CURLE_READ_ERROR; } else { /* set bits.netrc TRUE to remember that we got the name from a .netrc @@ -3388,25 +3440,35 @@ static CURLcode resolve_server(struct Curl_easy *data, struct Curl_dns_entry *hostaddr = NULL; #ifdef USE_UNIX_SOCKETS - if(conn->unix_domain_socket) { + char *unix_path = NULL; + + if(conn->unix_domain_socket) + unix_path = conn->unix_domain_socket; +#ifndef CURL_DISABLE_PROXY + else if(conn->socks_proxy.host.name + && !strncmp(UNIX_SOCKET_PREFIX"/", + conn->socks_proxy.host.name, sizeof(UNIX_SOCKET_PREFIX))) + unix_path = conn->socks_proxy.host.name + sizeof(UNIX_SOCKET_PREFIX) - 1; +#endif + + if(unix_path) { /* Unix domain sockets are local. The host gets ignored, just use the * specified domain socket address. Do not cache "DNS entries". There is * no DNS involved and we already have the filesystem path available */ - const char *path = conn->unix_domain_socket; hostaddr = calloc(1, sizeof(struct Curl_dns_entry)); if(!hostaddr) result = CURLE_OUT_OF_MEMORY; else { bool longpath = FALSE; - hostaddr->addr = Curl_unix2addr(path, &longpath, + hostaddr->addr = Curl_unix2addr(unix_path, &longpath, conn->bits.abstract_unix_socket); if(hostaddr->addr) hostaddr->inuse++; else { /* Long paths are not supported for now */ if(longpath) { - failf(data, "Unix socket path too long: '%s'", path); + failf(data, "Unix socket path too long: '%s'", unix_path); result = CURLE_COULDNT_RESOLVE_HOST; } else @@ -3502,17 +3564,6 @@ static void reuse_conn(struct Curl_easy *data, **established** from the primary socket to a remote address. */ char local_ip[MAX_IPADR_LEN] = ""; int local_port = -1; -#ifndef CURL_DISABLE_PROXY - Curl_free_idnconverted_hostname(&old_conn->http_proxy.host); - Curl_free_idnconverted_hostname(&old_conn->socks_proxy.host); - - free(old_conn->http_proxy.host.rawalloc); - free(old_conn->socks_proxy.host.rawalloc); - Curl_free_primary_ssl_config(&old_conn->proxy_ssl_config); -#endif - /* free the SSL config struct from this connection struct as this was - allocated in vain and is targeted for destruction */ - Curl_free_primary_ssl_config(&old_conn->ssl_config); /* get the user+password information from the old_conn struct since it may * be new for this request even when we re-use an existing connection */ @@ -3543,20 +3594,17 @@ static void reuse_conn(struct Curl_easy *data, old_conn->http_proxy.passwd = NULL; old_conn->socks_proxy.passwd = NULL; } - Curl_safefree(old_conn->http_proxy.user); - Curl_safefree(old_conn->socks_proxy.user); - Curl_safefree(old_conn->http_proxy.passwd); - Curl_safefree(old_conn->socks_proxy.passwd); #endif - /* host can change, when doing keepalive with a proxy or if the case is - different this time etc */ Curl_free_idnconverted_hostname(&conn->host); Curl_free_idnconverted_hostname(&conn->conn_to_host); Curl_safefree(conn->host.rawalloc); Curl_safefree(conn->conn_to_host.rawalloc); conn->host = old_conn->host; + old_conn->host.rawalloc = NULL; + old_conn->host.encalloc = NULL; conn->conn_to_host = old_conn->conn_to_host; + old_conn->conn_to_host.rawalloc = NULL; conn->conn_to_port = old_conn->conn_to_port; conn->remote_port = old_conn->remote_port; Curl_safefree(conn->hostname_resolve); @@ -3576,15 +3624,7 @@ static void reuse_conn(struct Curl_easy *data, /* re-use init */ conn->bits.reuse = TRUE; /* yes, we're re-using here */ - Curl_safefree(old_conn->user); - Curl_safefree(old_conn->passwd); - Curl_safefree(old_conn->options); - Curl_safefree(old_conn->localdev); - Curl_llist_destroy(&old_conn->easyq, NULL); - -#ifdef USE_UNIX_SOCKETS - Curl_safefree(old_conn->unix_domain_socket); -#endif + conn_free(old_conn); } /** @@ -3834,8 +3874,6 @@ static CURLcode create_conn(struct Curl_easy *data, data->set.ssl.primary.CAfile = data->set.str[STRING_SSL_CAFILE]; data->set.ssl.primary.issuercert = data->set.str[STRING_SSL_ISSUERCERT]; data->set.ssl.primary.issuercert_blob = data->set.blobs[BLOB_SSL_ISSUERCERT]; - data->set.ssl.primary.random_file = data->set.str[STRING_SSL_RANDOM_FILE]; - data->set.ssl.primary.egdsocket = data->set.str[STRING_SSL_EGDSOCKET]; data->set.ssl.primary.cipher_list = data->set.str[STRING_SSL_CIPHER_LIST]; data->set.ssl.primary.cipher_list13 = @@ -3849,9 +3887,6 @@ static CURLcode create_conn(struct Curl_easy *data, #ifndef CURL_DISABLE_PROXY data->set.proxy_ssl.primary.CApath = data->set.str[STRING_SSL_CAPATH_PROXY]; data->set.proxy_ssl.primary.CAfile = data->set.str[STRING_SSL_CAFILE_PROXY]; - data->set.proxy_ssl.primary.random_file = - data->set.str[STRING_SSL_RANDOM_FILE]; - data->set.proxy_ssl.primary.egdsocket = data->set.str[STRING_SSL_EGDSOCKET]; data->set.proxy_ssl.primary.cipher_list = data->set.str[STRING_SSL_CIPHER_LIST_PROXY]; data->set.proxy_ssl.primary.cipher_list13 = @@ -3934,10 +3969,6 @@ static CURLcode create_conn(struct Curl_easy *data, * allocated before we can move along and use the previously existing one. */ reuse_conn(data, conn, conn_temp); -#ifdef USE_SSL - free(conn->ssl_extra); -#endif - free(conn); /* we don't need this anymore */ conn = conn_temp; *in_connect = conn; diff --git a/libs/libcurl/src/url.h b/libs/libcurl/src/url.h index 59a1c24919..e3b2940305 100644 --- a/libs/libcurl/src/url.h +++ b/libs/libcurl/src/url.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/urlapi-int.h b/libs/libcurl/src/urlapi-int.h index bd6b601751..a03aa888af 100644 --- a/libs/libcurl/src/urlapi-int.h +++ b/libs/libcurl/src/urlapi-int.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/urlapi.c b/libs/libcurl/src/urlapi.c index 2a36de6a58..dee4b5aa09 100644 --- a/libs/libcurl/src/urlapi.c +++ b/libs/libcurl/src/urlapi.c @@ -18,6 +18,8 @@ * 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" @@ -175,14 +177,17 @@ static size_t strlen_url(const char *url, bool relative) * the source URL accordingly. * URL encoding should be skipped for host names, otherwise IDN resolution * will fail. + * + * Returns TRUE if something was updated. */ -static void strcpy_url(char *output, const char *url, bool relative) +static bool strcpy_url(char *output, const char *url, bool relative) { /* we must add this with whitespace-replacing */ bool left = TRUE; const unsigned char *iptr; char *optr = output; const unsigned char *host_sep = (const unsigned char *) url; + bool changed = FALSE; if(!relative) host_sep = (const unsigned char *) find_host_sep(url); @@ -204,6 +209,7 @@ static void strcpy_url(char *output, const char *url, bool relative) } else *optr++='+'; /* add a '+' here */ + changed = TRUE; continue; } @@ -212,6 +218,7 @@ static void strcpy_url(char *output, const char *url, bool relative) if(urlchar_needs_escaping(*iptr)) { msnprintf(optr, 4, "%%%02x", *iptr); + changed = TRUE; optr += 3; } else @@ -219,6 +226,7 @@ static void strcpy_url(char *output, const char *url, bool relative) } *optr = 0; /* null-terminate output buffer */ + return changed; } /* @@ -1436,6 +1444,19 @@ CURLUcode curl_url_get(CURLU *u, CURLUPart what, } *part = decoded; } + if(urlencode) { + /* worst case output length is 3x the original! */ + char *newp = malloc(strlen(*part) * 3); + if(!newp) + return CURLUE_OUT_OF_MEMORY; + if(strcpy_url(newp, *part, TRUE)) { /* consider it relative */ + free(*part); + *part = newp; + } + else + free(newp); + } + return CURLUE_OK; } else @@ -1497,6 +1518,10 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what, if(storep && *storep) { Curl_safefree(*storep); } + else if(!storep) { + free_urlhandle(u); + memset(u, 0, sizeof(struct Curl_URL)); + } return CURLUE_OK; } diff --git a/libs/libcurl/src/urldata.h b/libs/libcurl/src/urldata.h index 584434d774..bcb4d460c2 100644 --- a/libs/libcurl/src/urldata.h +++ b/libs/libcurl/src/urldata.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* This file is for lib internal stuff */ @@ -180,15 +182,6 @@ typedef CURLcode (*Curl_datastream)(struct Curl_easy *data, #define GOOD_EASY_HANDLE(x) \ ((x) && ((x)->magic == CURLEASY_MAGIC_NUMBER)) -/* the type we use for storing a single boolean bit */ -#ifdef _MSC_VER -typedef bool bit; -#define BIT(x) bool x -#else -typedef unsigned int bit; -#define BIT(x) bit x:1 -#endif - #ifdef HAVE_GSSAPI /* Types needed for krb5-ftp connections */ struct krb5buffer { @@ -248,8 +241,6 @@ struct ssl_primary_config { char *CAfile; /* certificate to verify peer against */ char *issuercert; /* optional issuer certificate filename */ char *clientcert; - char *random_file; /* path to file containing "random" data */ - char *egdsocket; /* path to file containing the EGD daemon socket */ char *cipher_list; /* list of ciphers to use */ char *cipher_list13; /* list of TLS 1.3 cipher suites to use */ char *pinned_key; @@ -707,6 +698,7 @@ struct SingleRequest { #ifndef CURL_DISABLE_DOH struct dohdata *doh; /* DoH specific data for this request */ #endif + unsigned char setcookies; BIT(header); /* incoming data has HTTP header */ BIT(content_range); /* set TRUE if Content-Range: was found */ BIT(upload_done); /* set to TRUE when doing chunked transfer-encoding @@ -1091,18 +1083,38 @@ struct connectdata { struct dynbuf trailer; union { +#ifndef CURL_DISABLE_FTP struct ftp_conn ftpc; +#endif +#ifndef CURL_DISABLE_HTTP struct http_conn httpc; +#endif +#ifdef USE_SSH struct ssh_conn sshc; +#endif +#ifndef CURL_DISABLE_TFTP struct tftp_state_data *tftpc; +#endif +#ifndef CURL_DISABLE_IMAP struct imap_conn imapc; +#endif +#ifndef CURL_DISABLE_POP3 struct pop3_conn pop3c; +#endif +#ifndef CURL_DISABLE_SMTP struct smtp_conn smtpc; +#endif +#ifndef CURL_DISABLE_RTSP struct rtsp_conn rtspc; +#endif +#ifndef CURL_DISABLE_SMB struct smb_conn smbc; +#endif void *rtmp; struct ldapconninfo *ldapc; +#ifndef CURL_DISABLE_MQTT struct mqtt_conn mqtt; +#endif } proto; struct http_connect_state *connect_state; /* for HTTP CONNECT */ @@ -1356,9 +1368,10 @@ struct UrlState { /* storage for the previous bag^H^H^HSIGPIPE signal handler :-) */ void (*prev_signal)(int sig); #endif +#ifndef CURL_DISABLE_CRYPTO_AUTH struct digestdata digest; /* state data for host Digest auth */ struct digestdata proxydigest; /* state data for proxy Digest auth */ - +#endif struct auth authhost; /* auth details for host */ struct auth authproxy; /* auth details for proxy */ #ifdef USE_CURL_ASYNC @@ -1374,7 +1387,7 @@ struct UrlState { struct Curl_llist timeoutlist; /* list of pending timeouts */ struct time_node expires[EXPIRE_LAST]; /* nodes for each expire type */ - /* a place to store the most recently set FTP entrypath */ + /* a place to store the most recently set (S)FTP entrypath */ char *most_recent_ftp_entrypath; unsigned char httpwant; /* when non-zero, a specific HTTP version requested to be used in the library's request(s) */ @@ -1393,30 +1406,36 @@ struct UrlState { this syntax. */ curl_off_t resume_from; /* continue [ftp] transfer from here */ +#ifndef CURL_DISABLE_RTSP /* This RTSP state information survives requests and connections */ long rtsp_next_client_CSeq; /* the session's next client CSeq */ long rtsp_next_server_CSeq; /* the session's next server CSeq */ long rtsp_CSeq_recv; /* most recent CSeq received */ +#endif curl_off_t infilesize; /* size of file to upload, -1 means unknown. Copied from set.filesize at start of operation */ - +#if defined(USE_HTTP2) || defined(USE_HTTP3) size_t drain; /* Increased when this stream has data to read, even if its socket is not necessarily is readable. Decreased when checked. */ +#endif curl_read_callback fread_func; /* read callback/function */ void *in; /* CURLOPT_READDATA */ - +#ifdef USE_HTTP2 struct Curl_easy *stream_depends_on; int stream_weight; +#endif CURLU *uh; /* URL handle for the current parsed URL */ struct urlpieces up; Curl_HttpReq httpreq; /* what kind of HTTP request (if any) is this */ char *url; /* work URL, copied from UserDefined */ char *referer; /* referer string */ +#ifndef CURL_DISABLE_COOKIES struct curl_slist *cookielist; /* list of cookie files set by curl_easy_setopt(COOKIEFILE) calls */ +#endif struct curl_slist *resolve; /* set to point to the set.resolve list when this should be dealt with in pretransfer */ #ifndef CURL_DISABLE_HTTP @@ -1425,9 +1444,10 @@ struct UrlState { headers */ struct Curl_llist httphdrs; /* received headers */ struct curl_header headerout; /* for external purposes */ -#endif + struct Curl_header_store *prevhead; /* the latest added header */ trailers_state trailers_state; /* whether we are sending trailers - and what stage are we at */ + and what stage are we at */ +#endif #ifdef USE_HYPER bool hconnect; /* set if a CONNECT request */ CURLcode hresult; /* used to pass return codes back from hyper callbacks */ @@ -1471,7 +1491,6 @@ struct UrlState { is always set TRUE when curl_easy_perform() is called. */ BIT(authproblem); /* TRUE if there's some problem authenticating */ /* set after initial USER failure, to prevent an authentication loop */ - BIT(ftp_trying_alternative); BIT(wildcardmatch); /* enable wildcard matching */ BIT(expect100header); /* TRUE if we added Expect: 100-continue */ BIT(disableexpect); /* TRUE if Expect: is disabled due to a previous @@ -1548,8 +1567,6 @@ enum dupstring { STRING_SSL_CIPHER_LIST_PROXY, /* list of ciphers to use */ STRING_SSL_CIPHER13_LIST, /* list of TLS 1.3 ciphers to use */ STRING_SSL_CIPHER13_LIST_PROXY, /* list of TLS 1.3 ciphers to use */ - STRING_SSL_EGDSOCKET, /* path to file containing the EGD daemon socket */ - STRING_SSL_RANDOM_FILE, /* path to file containing "random" data */ STRING_USERAGENT, /* User-Agent string */ STRING_SSL_CRLFILE, /* crl file to check certificate */ STRING_SSL_CRLFILE_PROXY, /* crl file to check certificate */ @@ -1632,16 +1649,15 @@ struct UserDefined { void *out; /* CURLOPT_WRITEDATA */ void *in_set; /* CURLOPT_READDATA */ void *writeheader; /* write the header to this if non-NULL */ - void *rtp_out; /* write RTP to this if non-NULL */ long use_port; /* which port to use (when not using default) */ unsigned long httpauth; /* kind of HTTP authentication to use (bitmask) */ unsigned long proxyauth; /* kind of proxy authentication to use (bitmask) */ +#ifndef CURL_DISABLE_PROXY unsigned long socks5auth;/* kind of SOCKS5 authentication to use (bitmask) */ +#endif long maxredirs; /* maximum no. of http(s) redirects to follow, set to -1 for infinity */ - int keep_post; /* keep POSTs as POSTs after a 30x request; each - bit represents a request, from 301 to 303 */ void *postfields; /* if POST, set the fields' values here */ curl_seek_callback seek_func; /* function that seeks the input */ curl_off_t postfieldsize; /* if POST, this might have a size to use instead @@ -1681,14 +1697,15 @@ struct UserDefined { void *ioctl_client; /* pointer to pass to the ioctl callback */ long timeout; /* in milliseconds, 0 means no timeout */ long connecttimeout; /* in milliseconds, 0 means no timeout */ - long accepttimeout; /* in milliseconds, 0 means no timeout */ long happy_eyeballs_timeout; /* in milliseconds, 0 is a valid value */ long server_response_timeout; /* in milliseconds, 0 means no timeout */ long maxage_conn; /* in seconds, max idle time to allow a connection that is to be reused */ long maxlifetime_conn; /* in seconds, max time since creation to allow a connection that is to be reused */ +#ifndef CURL_DISABLE_TFTP long tftp_blksize; /* in bytes, 0 means use default */ +#endif curl_off_t filesize; /* size of file to upload, -1 means unknown */ long low_speed_limit; /* bytes/second */ long low_speed_time; /* number of seconds */ @@ -1708,7 +1725,9 @@ struct UserDefined { the transfer on source host */ struct curl_slist *source_postquote; /* in 3rd party transfer mode - after the transfer on source host */ +#ifndef CURL_DISABLE_TELNET struct curl_slist *telnet_options; /* linked list of telnet options */ +#endif struct curl_slist *resolve; /* list of names to add/remove from DNS cache */ struct curl_slist *connect_to; /* list of host:port mappings to override @@ -1737,10 +1756,16 @@ struct UserDefined { curl_ftpfile ftp_filemethod; /* how to get to a file when FTP is used */ curl_ftpauth ftpsslauth; /* what AUTH XXX to be attempted */ curl_ftpccc ftp_ccc; /* FTP CCC options */ + long accepttimeout; /* in milliseconds, 0 means no timeout */ #endif int ftp_create_missing_dirs; /* 1 - create directories that don't exist 2 - the same but also allow MKD to fail once */ +#ifdef USE_LIBSSH2 + curl_sshhostkeycallback ssh_hostkeyfunc; /* hostkey check callback */ + void *ssh_hostkeyfunc_userp; /* custom pointer to callback */ +#endif + curl_sshkeycallback ssh_keyfunc; /* key matching callback */ void *ssh_keyfunc_userp; /* custom pointer to callback */ #ifndef CURL_DISABLE_NETRC @@ -1749,21 +1774,25 @@ struct UserDefined { #endif curl_usessl use_ssl; /* if AUTH TLS is to be attempted etc, for FTP or IMAP or POP3 or others! */ - long new_file_perms; /* Permissions to use when creating remote files */ - long new_directory_perms; /* Permissions to use when creating remote dirs */ - long ssh_auth_types; /* allowed SSH auth types */ + unsigned int new_file_perms; /* when creating remote files */ + unsigned int new_directory_perms; /* when creating remote dirs */ + int ssh_auth_types; /* allowed SSH auth types */ char *str[STRING_LAST]; /* array of strings, pointing to allocated memory */ struct curl_blob *blobs[BLOB_LAST]; #ifdef ENABLE_IPV6 unsigned int scope_id; /* Scope id for IPv6 */ #endif - long allowed_protocols; - long redir_protocols; - long mime_options; /* Mime option flags. */ - struct curl_slist *mail_rcpt; /* linked list of mail recipients */ + unsigned int allowed_protocols; + unsigned int redir_protocols; + unsigned int mime_options; /* Mime option flags. */ + +#ifndef CURL_DISABLE_RTSP + void *rtp_out; /* write RTP to this if non-NULL */ /* Common RTSP header options */ Curl_RtspReq rtspreq; /* RTSP request type */ long rtspversion; /* like httpversion, for RTSP */ +#endif +#ifndef CURL_DISABLE_FTP curl_chunk_bgn_callback chunk_bgn; /* called before part of transfer starts */ curl_chunk_end_callback chunk_end; /* called after part transferring @@ -1771,38 +1800,46 @@ struct UserDefined { curl_fnmatch_callback fnmatch; /* callback to decide which file corresponds to pattern (e.g. if WILDCARDMATCH is on) */ void *fnmatch_data; - +#endif long gssapi_delegation; /* GSS-API credential delegation, see the documentation of CURLOPT_GSSAPI_DELEGATION */ - long tcp_keepidle; /* seconds in idle before sending keepalive probe */ - long tcp_keepintvl; /* seconds between TCP keepalive probes */ + int tcp_keepidle; /* seconds in idle before sending keepalive probe */ + int tcp_keepintvl; /* seconds between TCP keepalive probes */ size_t maxconnects; /* Max idle connections in the connection cache */ long expect_100_timeout; /* in milliseconds */ +#ifdef USE_HTTP2 struct Curl_easy *stream_depends_on; int stream_weight; struct Curl_http2_dep *stream_dependents; - +#endif curl_resolver_start_callback resolver_start; /* optional callback called before resolver start */ void *resolver_start_client; /* pointer to pass to resolver start callback */ long upkeep_interval_ms; /* Time between calls for connection upkeep. */ multidone_func fmultidone; +#ifndef CURL_DISABLE_DOH struct Curl_easy *dohfor; /* this is a DoH request for that transfer */ +#endif CURLU *uh; /* URL handle for the current parsed URL */ void *trailer_data; /* pointer to pass to trailer data callback */ curl_trailer_callback trailer_callback; /* trailing data callback */ + char keep_post; /* keep POSTs as POSTs after a 30x request; each + bit represents a request, from 301 to 303 */ +#ifndef CURL_DISABLE_SMTP + struct curl_slist *mail_rcpt; /* linked list of mail recipients */ + BIT(mail_rcpt_allowfails); /* allow RCPT TO command to fail for some + recipients */ +#endif BIT(is_fread_set); /* has read callback been set to non-NULL? */ - BIT(is_fwrite_set); /* has write callback been set to non-NULL? */ - BIT(free_referer); /* set TRUE if 'referer' points to a string we - allocated */ +#ifndef CURL_DISABLE_TFTP BIT(tftp_no_options); /* do not send TFTP options requests */ +#endif BIT(sep_headers); /* handle host and proxy headers separately */ BIT(cookiesession); /* new cookie session? */ BIT(crlf); /* convert crlf on ftp upload(?) */ - BIT(strip_path_slash); /* strip off initial slash from path */ BIT(ssh_compression); /* enable SSH compression */ /* Here follows boolean settings that define how to behave during @@ -1820,6 +1857,7 @@ struct UserDefined { BIT(ftp_use_pret); /* if PRET is to be used before PASV or not */ BIT(ftp_skip_ip); /* skip the IP address the FTP server passes on to us */ + BIT(wildcard_enabled); /* enable wildcard matching */ #endif BIT(hide_progress); /* don't use the progress meter */ BIT(http_fail_on_error); /* fail on HTTP error codes >= 400 */ @@ -1851,7 +1889,6 @@ struct UserDefined { BIT(socks5_gssapi_nec); /* Flag to support NEC SOCKS5 server */ #endif BIT(sasl_ir); /* Enable/disable SASL initial response */ - BIT(wildcard_enabled); /* enable wildcard matching */ BIT(tcp_keepalive); /* use TCP keepalives */ BIT(tcp_fastopen); /* use TCP Fast Open */ BIT(ssl_enable_npn); /* TLS NPN extension? */ @@ -1874,8 +1911,6 @@ struct UserDefined { BIT(doh_verifystatus); /* DoH certificate status verification */ #endif BIT(http09_allowed); /* allow HTTP/0.9 responses */ - BIT(mail_rcpt_allowfails); /* allow RCPT TO command to fail for some - recipients */ }; struct Names { @@ -1937,10 +1972,12 @@ struct Curl_easy { #endif struct SingleRequest req; /* Request-specific data */ struct UserDefined set; /* values set by the libcurl user */ +#ifndef CURL_DISABLE_COOKIES struct CookieInfo *cookies; /* the cookies, read from files and servers. NOTE that the 'cookie' field in the UserDefined struct defines if the "engine" is to be used or not. */ +#endif #ifndef CURL_DISABLE_HSTS struct hsts *hsts; #endif diff --git a/libs/libcurl/src/vauth/cleartext.c b/libs/libcurl/src/vauth/cleartext.c index d17e16f108..b82b171467 100644 --- a/libs/libcurl/src/vauth/cleartext.c +++ b/libs/libcurl/src/vauth/cleartext.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC4616 PLAIN authentication * Draft LOGIN SASL Mechanism <draft-murchison-sasl-login-00.txt> * diff --git a/libs/libcurl/src/vauth/cram.c b/libs/libcurl/src/vauth/cram.c index 9ddb0ac379..475d31b8d7 100644 --- a/libs/libcurl/src/vauth/cram.c +++ b/libs/libcurl/src/vauth/cram.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC2195 CRAM-MD5 authentication * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/digest.c b/libs/libcurl/src/vauth/digest.c index d4616095da..355cd74a6e 100644 --- a/libs/libcurl/src/vauth/digest.c +++ b/libs/libcurl/src/vauth/digest.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC2831 DIGEST-MD5 authentication * RFC7616 DIGEST-SHA256, DIGEST-SHA512-256 authentication * @@ -79,44 +81,50 @@ bool Curl_auth_digest_get_pair(const char *str, char *value, char *content, } for(c = DIGEST_MAX_CONTENT_LENGTH - 1; *str && c--; str++) { - switch(*str) { - case '\\': - if(!escape) { - /* possibly the start of an escaped quote */ - escape = TRUE; - *content++ = '\\'; /* Even though this is an escape character, we still - store it as-is in the target buffer */ - continue; - } - break; - - case ',': - if(!starts_with_quote) { - /* This signals the end of the content if we didn't get a starting - quote and then we do "sloppy" parsing */ - c = 0; /* the end */ - continue; - } - break; - - case '\r': - case '\n': - /* end of string */ - c = 0; - continue; + if(!escape) { + switch(*str) { + case '\\': + if(starts_with_quote) { + /* the start of an escaped quote */ + escape = TRUE; + continue; + } + break; + + case ',': + if(!starts_with_quote) { + /* This signals the end of the content if we didn't get a starting + quote and then we do "sloppy" parsing */ + c = 0; /* the end */ + continue; + } + break; - case '\"': - if(!escape && starts_with_quote) { + case '\r': + case '\n': /* end of string */ + if(starts_with_quote) + return FALSE; /* No closing quote */ c = 0; continue; + + case '\"': + if(starts_with_quote) { + /* end of string */ + c = 0; + continue; + } + else + return FALSE; + break; } - break; } escape = FALSE; *content++ = *str; } + if(escape) + return FALSE; /* No character after backslash */ *content = 0; *endptr = str; @@ -664,6 +672,8 @@ static CURLcode auth_create_digest_http_message( char *cnonce = NULL; size_t cnonce_sz = 0; char *userp_quoted; + char *realm_quoted; + char *nonce_quoted; char *response = NULL; char *hashthis = NULL; char *tmp = NULL; @@ -687,7 +697,7 @@ static CURLcode auth_create_digest_http_message( } if(digest->userhash) { - hashthis = aprintf("%s:%s", userp, digest->realm); + hashthis = aprintf("%s:%s", userp, digest->realm ? digest->realm : ""); if(!hashthis) return CURLE_OUT_OF_MEMORY; @@ -707,7 +717,8 @@ static CURLcode auth_create_digest_http_message( unq(nonce-value) ":" unq(cnonce-value) */ - hashthis = aprintf("%s:%s:%s", userp, digest->realm, passwdp); + hashthis = aprintf("%s:%s:%s", userp, digest->realm ? digest->realm : "", + passwdp); if(!hashthis) return CURLE_OUT_OF_MEMORY; @@ -786,16 +797,33 @@ static CURLcode auth_create_digest_http_message( nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca" Digest parameters are all quoted strings. Username which is provided by - the user will need double quotes and backslashes within it escaped. For - the other fields, this shouldn't be an issue. realm, nonce, and opaque - are copied as is from the server, escapes and all. cnonce is generated - with web-safe characters. uri is already percent encoded. nc is 8 hex + the user will need double quotes and backslashes within it escaped. + realm, nonce, and opaque will need backslashes as well as they were + de-escaped when copied from request header. cnonce is generated with + web-safe characters. uri is already percent encoded. nc is 8 hex characters. algorithm and qop with standard values only contain web-safe characters. */ userp_quoted = auth_digest_string_quoted(digest->userhash ? userh : userp); if(!userp_quoted) return CURLE_OUT_OF_MEMORY; + if(digest->realm) + realm_quoted = auth_digest_string_quoted(digest->realm); + else { + realm_quoted = malloc(1); + if(realm_quoted) + realm_quoted[0] = 0; + } + if(!realm_quoted) { + free(userp_quoted); + return CURLE_OUT_OF_MEMORY; + } + nonce_quoted = auth_digest_string_quoted(digest->nonce); + if(!nonce_quoted) { + free(realm_quoted); + free(userp_quoted); + return CURLE_OUT_OF_MEMORY; + } if(digest->qop) { response = aprintf("username=\"%s\", " @@ -807,8 +835,8 @@ static CURLcode auth_create_digest_http_message( "qop=%s, " "response=\"%s\"", userp_quoted, - digest->realm, - digest->nonce, + realm_quoted, + nonce_quoted, uripath, digest->cnonce, digest->nc, @@ -827,18 +855,26 @@ static CURLcode auth_create_digest_http_message( "uri=\"%s\", " "response=\"%s\"", userp_quoted, - digest->realm, - digest->nonce, + realm_quoted, + nonce_quoted, uripath, request_digest); } + free(nonce_quoted); + free(realm_quoted); free(userp_quoted); if(!response) return CURLE_OUT_OF_MEMORY; /* Add the optional fields */ if(digest->opaque) { + char *opaque_quoted; /* Append the opaque */ + opaque_quoted = auth_digest_string_quoted(digest->opaque); + if(!opaque_quoted) { + free(response); + return CURLE_OUT_OF_MEMORY; + } tmp = aprintf("%s, opaque=\"%s\"", response, digest->opaque); free(response); if(!tmp) diff --git a/libs/libcurl/src/vauth/digest.h b/libs/libcurl/src/vauth/digest.h index ee373cd82e..6a2f565894 100644 --- a/libs/libcurl/src/vauth/digest.h +++ b/libs/libcurl/src/vauth/digest.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> diff --git a/libs/libcurl/src/vauth/digest_sspi.c b/libs/libcurl/src/vauth/digest_sspi.c index 94f8f8c0df..af463848a6 100644 --- a/libs/libcurl/src/vauth/digest_sspi.c +++ b/libs/libcurl/src/vauth/digest_sspi.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2014 - 2016, Steve Holme, <steve_holme@hotmail.com>. - * Copyright (C) 2015 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2015 - 2022, 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 @@ -19,6 +19,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC2831 DIGEST-MD5 authentication * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/gsasl.c b/libs/libcurl/src/vauth/gsasl.c index 40fef53c93..9d137b72ca 100644 --- a/libs/libcurl/src/vauth/gsasl.c +++ b/libs/libcurl/src/vauth/gsasl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020 - 2021, Simon Josefsson, <simon@josefsson.org>, et al. + * Copyright (C) 2020 - 2022, Simon Josefsson, <simon@josefsson.org>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC5802 SCRAM-SHA-1 authentication * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/krb5_gssapi.c b/libs/libcurl/src/vauth/krb5_gssapi.c index 67d43bd567..bac78049dc 100644 --- a/libs/libcurl/src/vauth/krb5_gssapi.c +++ b/libs/libcurl/src/vauth/krb5_gssapi.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2014 - 2019, Steve Holme, <steve_holme@hotmail.com>. - * Copyright (C) 2015 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2015 - 2022, 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 @@ -19,6 +19,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/krb5_sspi.c b/libs/libcurl/src/vauth/krb5_sspi.c index c652fd7365..895b4a1937 100644 --- a/libs/libcurl/src/vauth/krb5_sspi.c +++ b/libs/libcurl/src/vauth/krb5_sspi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2014 - 2021, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2014 - 2022, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/ntlm.c b/libs/libcurl/src/vauth/ntlm.c index 115f70b0e1..edaacbb9ed 100644 --- a/libs/libcurl/src/vauth/ntlm.c +++ b/libs/libcurl/src/vauth/ntlm.c @@ -18,6 +18,8 @@ * 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" @@ -62,6 +64,10 @@ /* "NTLMSSP" signature is always in ASCII regardless of the platform */ #define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50" +/* The fixed host name we provide, in order to not leak our real local host + name. Copy the name used by Firefox. */ +#define NTLM_HOSTNAME "WORKSTATION" + #if DEBUG_ME # define DEBUG_OUT(x) x static void ntlm_print_flags(FILE *handle, unsigned long flags) @@ -521,6 +527,7 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, userlen = strlen(user); +#ifndef NTLM_HOSTNAME /* Get the machine's un-qualified host name as NTLM doesn't like the fully qualified domain name */ if(Curl_gethostname(host, sizeof(host))) { @@ -530,6 +537,10 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, else { hostlen = strlen(host); } +#else + (void)msnprintf(host, sizeof(host), "%s", NTLM_HOSTNAME); + hostlen = sizeof(NTLM_HOSTNAME)-1; +#endif if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) { unsigned char ntbuffer[0x18]; diff --git a/libs/libcurl/src/vauth/ntlm.h b/libs/libcurl/src/vauth/ntlm.h index 8ec23ad4f5..97325d975c 100644 --- a/libs/libcurl/src/vauth/ntlm.h +++ b/libs/libcurl/src/vauth/ntlm.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vauth/ntlm_sspi.c b/libs/libcurl/src/vauth/ntlm_sspi.c index 3e39dad315..193576acaa 100644 --- a/libs/libcurl/src/vauth/ntlm_sspi.c +++ b/libs/libcurl/src/vauth/ntlm_sspi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vauth/oauth2.c b/libs/libcurl/src/vauth/oauth2.c index a5f16a0bf4..1604b303e0 100644 --- a/libs/libcurl/src/vauth/oauth2.c +++ b/libs/libcurl/src/vauth/oauth2.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC6749 OAuth 2.0 Authorization Framework * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/spnego_gssapi.c b/libs/libcurl/src/vauth/spnego_gssapi.c index 8c1a3edd04..25dff967d1 100644 --- a/libs/libcurl/src/vauth/spnego_gssapi.c +++ b/libs/libcurl/src/vauth/spnego_gssapi.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC4178 Simple and Protected GSS-API Negotiation Mechanism * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/spnego_sspi.c b/libs/libcurl/src/vauth/spnego_sspi.c index d219d8bb24..d845caca6c 100644 --- a/libs/libcurl/src/vauth/spnego_sspi.c +++ b/libs/libcurl/src/vauth/spnego_sspi.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * * RFC4178 Simple and Protected GSS-API Negotiation Mechanism * ***************************************************************************/ diff --git a/libs/libcurl/src/vauth/vauth.c b/libs/libcurl/src/vauth/vauth.c index 3624fb0c4a..9d6363df07 100644 --- a/libs/libcurl/src/vauth/vauth.c +++ b/libs/libcurl/src/vauth/vauth.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2014 - 2021, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2014 - 2022, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vauth/vauth.h b/libs/libcurl/src/vauth/vauth.h index 6e1237834a..1c4b5b5dc6 100644 --- a/libs/libcurl/src/vauth/vauth.h +++ b/libs/libcurl/src/vauth/vauth.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> diff --git a/libs/libcurl/src/version.c b/libs/libcurl/src/version.c index e37253df2a..4672182d50 100644 --- a/libs/libcurl/src/version.c +++ b/libs/libcurl/src/version.c @@ -18,6 +18,8 @@ * 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" @@ -29,6 +31,7 @@ #include "vssh/ssh.h" #include "quic.h" #include "curl_printf.h" +#include "easy_lock.h" #ifdef USE_ARES # if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ @@ -451,6 +454,9 @@ static curl_version_info_data version_info = { #if defined(USE_GSASL) | CURL_VERSION_GSASL #endif +#if defined(GLOBAL_INIT_IS_THREADSAFE) + | CURL_VERSION_THREADSAFE +#endif , NULL, /* ssl_version */ 0, /* ssl_version_num, this is kept at zero */ diff --git a/libs/libcurl/src/version_win32.c b/libs/libcurl/src/version_win32.c index afdb1d6a72..e8f14f9dff 100644 --- a/libs/libcurl/src/version_win32.c +++ b/libs/libcurl/src/version_win32.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/version_win32.h b/libs/libcurl/src/version_win32.h index 38af87fa09..7a9a6a14f1 100644 --- a/libs/libcurl/src/version_win32.h +++ b/libs/libcurl/src/version_win32.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2016 - 2021, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2016 - 2022, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vquic/msh3.c b/libs/libcurl/src/vquic/msh3.c index f7bd315be1..296943b22a 100644 --- a/libs/libcurl/src/vquic/msh3.c +++ b/libs/libcurl/src/vquic/msh3.c @@ -18,6 +18,8 @@ * 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" @@ -500,4 +502,16 @@ bool Curl_quic_data_pending(const struct Curl_easy *data) return stream->recv_header_len || stream->recv_data_len; } +/* + * Called from transfer.c:Curl_readwrite when neither HTTP level read + * nor write is performed. It is a good place to handle timer expiry + * for QUIC transport. + */ +CURLcode Curl_quic_idle(struct Curl_easy *data) +{ + (void)data; + H3BUGF(infof(data, "Curl_quic_idle")); + return CURLE_OK; +} + #endif /* USE_MSH3 */ diff --git a/libs/libcurl/src/vquic/msh3.h b/libs/libcurl/src/vquic/msh3.h index bacdcb1321..ce884d92dd 100644 --- a/libs/libcurl/src/vquic/msh3.h +++ b/libs/libcurl/src/vquic/msh3.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vquic/ngtcp2.c b/libs/libcurl/src/vquic/ngtcp2.c index f1a64eea85..ca9c388345 100644 --- a/libs/libcurl/src/vquic/ngtcp2.c +++ b/libs/libcurl/src/vquic/ngtcp2.c @@ -18,17 +18,22 @@ * 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_NGTCP2 #include <ngtcp2/ngtcp2.h> -#include <ngtcp2/ngtcp2_crypto.h> #include <nghttp3/nghttp3.h> #ifdef USE_OPENSSL #include <openssl/err.h> +#ifdef OPENSSL_IS_BORINGSSL +#include <ngtcp2/ngtcp2_crypto_boringssl.h> +#else #include <ngtcp2/ngtcp2_crypto_openssl.h> +#endif #include "vtls/openssl.h" #elif defined(USE_GNUTLS) #include <ngtcp2/ngtcp2_crypto_gnutls.h> @@ -98,6 +103,10 @@ struct h3out { "%DISABLE_TLS13_COMPAT_MODE" #endif +/* ngtcp2 default congestion controller does not perform pacing. Limit + the maximum packet burst to MAX_PKT_BURST packets. */ +#define MAX_PKT_BURST 10 + static CURLcode ng_process_ingress(struct Curl_easy *data, curl_socket_t sockfd, struct quicsocket *qs); @@ -107,6 +116,12 @@ static int cb_h3_acked_stream_data(nghttp3_conn *conn, int64_t stream_id, size_t datalen, void *user_data, void *stream_user_data); +static ngtcp2_conn *get_conn(ngtcp2_crypto_conn_ref *conn_ref) +{ + struct quicsocket *qs = conn_ref->user_data; + return qs->qconn; +} + static ngtcp2_tstamp timestamp(void) { struct curltime ct = Curl_now(); @@ -191,87 +206,32 @@ static int keylog_callback(gnutls_session_t session, const char *label, static int init_ngh3_conn(struct quicsocket *qs); -static int write_client_handshake(struct quicsocket *qs, - ngtcp2_crypto_level level, - const uint8_t *data, size_t len) -{ - int rv; - - rv = ngtcp2_conn_submit_crypto_data(qs->qconn, level, data, len); - if(rv) { - H3BUGF(fprintf(stderr, "write_client_handshake failed\n")); - } - assert(0 == rv); - - return 1; -} - #ifdef USE_OPENSSL -static int quic_set_encryption_secrets(SSL *ssl, - OSSL_ENCRYPTION_LEVEL ossl_level, - const uint8_t *rx_secret, - const uint8_t *tx_secret, - size_t secretlen) -{ - struct quicsocket *qs = (struct quicsocket *)SSL_get_app_data(ssl); - int level = ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level); - - if(ngtcp2_crypto_derive_and_install_rx_key( - qs->qconn, NULL, NULL, NULL, level, rx_secret, secretlen) != 0) - return 0; - - if(ngtcp2_crypto_derive_and_install_tx_key( - qs->qconn, NULL, NULL, NULL, level, tx_secret, secretlen) != 0) - return 0; - - if(level == NGTCP2_CRYPTO_LEVEL_APPLICATION) { - if(init_ngh3_conn(qs) != CURLE_OK) - return 0; - } - - return 1; -} - -static int quic_add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level, - const uint8_t *data, size_t len) -{ - struct quicsocket *qs = (struct quicsocket *)SSL_get_app_data(ssl); - ngtcp2_crypto_level level = - ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level); - - return write_client_handshake(qs, level, data, len); -} - -static int quic_flush_flight(SSL *ssl) -{ - (void)ssl; - return 1; -} - -static int quic_send_alert(SSL *ssl, enum ssl_encryption_level_t level, - uint8_t alert) -{ - struct quicsocket *qs = (struct quicsocket *)SSL_get_app_data(ssl); - (void)level; - - qs->tls_alert = alert; - return 1; -} - -static SSL_QUIC_METHOD quic_method = {quic_set_encryption_secrets, - quic_add_handshake_data, - quic_flush_flight, quic_send_alert}; - static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) { struct connectdata *conn = data->conn; SSL_CTX *ssl_ctx = SSL_CTX_new(TLS_method()); - SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_3_VERSION); - SSL_CTX_set_max_proto_version(ssl_ctx, TLS1_3_VERSION); +#ifdef OPENSSL_IS_BORINGSSL + if(ngtcp2_crypto_boringssl_configure_client_context(ssl_ctx) != 0) { + failf(data, "ngtcp2_crypto_boringssl_configure_client_context failed"); + return NULL; + } +#else + if(ngtcp2_crypto_openssl_configure_client_context(ssl_ctx) != 0) { + failf(data, "ngtcp2_crypto_openssl_configure_client_context failed"); + return NULL; + } +#endif SSL_CTX_set_default_verify_paths(ssl_ctx); +#ifdef OPENSSL_IS_BORINGSSL + if(SSL_CTX_set1_curves_list(ssl_ctx, QUIC_GROUPS) != 1) { + failf(data, "SSL_CTX_set1_curves_list failed"); + return NULL; + } +#else if(SSL_CTX_set_ciphersuites(ssl_ctx, QUIC_CIPHERS) != 1) { char error_buffer[256]; ERR_error_string_n(ERR_get_error(), error_buffer, sizeof(error_buffer)); @@ -283,8 +243,7 @@ static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) failf(data, "SSL_CTX_set1_groups_list failed"); return NULL; } - - SSL_CTX_set_quic_method(ssl_ctx, &quic_method); +#endif /* Open the file if a TLS or QUIC backend has not done this before. */ Curl_tls_keylog_open(); @@ -353,7 +312,7 @@ static int quic_init_ssl(struct quicsocket *qs) DEBUGASSERT(!qs->ssl); qs->ssl = SSL_new(qs->sslctx); - SSL_set_app_data(qs->ssl, qs); + SSL_set_app_data(qs->ssl, &qs->conn_ref); SSL_set_connect_state(qs->ssl); SSL_set_quic_use_legacy_codepoint(qs->ssl, 0); @@ -367,107 +326,6 @@ static int quic_init_ssl(struct quicsocket *qs) return 0; } #elif defined(USE_GNUTLS) -static int secret_func(gnutls_session_t ssl, - gnutls_record_encryption_level_t gtls_level, - const void *rx_secret, - const void *tx_secret, size_t secretlen) -{ - struct quicsocket *qs = gnutls_session_get_ptr(ssl); - int level = - ngtcp2_crypto_gnutls_from_gnutls_record_encryption_level(gtls_level); - - if(level != NGTCP2_CRYPTO_LEVEL_EARLY && - ngtcp2_crypto_derive_and_install_rx_key( - qs->qconn, NULL, NULL, NULL, level, rx_secret, secretlen) != 0) - return 0; - - if(ngtcp2_crypto_derive_and_install_tx_key( - qs->qconn, NULL, NULL, NULL, level, tx_secret, secretlen) != 0) - return 0; - - if(level == NGTCP2_CRYPTO_LEVEL_APPLICATION) { - if(init_ngh3_conn(qs) != CURLE_OK) - return -1; - } - - return 0; -} - -static int read_func(gnutls_session_t ssl, - gnutls_record_encryption_level_t gtls_level, - gnutls_handshake_description_t htype, const void *data, - size_t len) -{ - struct quicsocket *qs = gnutls_session_get_ptr(ssl); - ngtcp2_crypto_level level = - ngtcp2_crypto_gnutls_from_gnutls_record_encryption_level(gtls_level); - int rv; - - if(htype == GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC) - return 0; - - rv = write_client_handshake(qs, level, data, len); - if(rv == 0) - return -1; - - return 0; -} - -static int alert_read_func(gnutls_session_t ssl, - gnutls_record_encryption_level_t gtls_level, - gnutls_alert_level_t alert_level, - gnutls_alert_description_t alert_desc) -{ - struct quicsocket *qs = gnutls_session_get_ptr(ssl); - (void)gtls_level; - (void)alert_level; - - qs->tls_alert = alert_desc; - return 1; -} - -static int tp_recv_func(gnutls_session_t ssl, const uint8_t *data, - size_t data_size) -{ - struct quicsocket *qs = gnutls_session_get_ptr(ssl); - ngtcp2_transport_params params; - - if(ngtcp2_decode_transport_params( - ¶ms, NGTCP2_TRANSPORT_PARAMS_TYPE_ENCRYPTED_EXTENSIONS, - data, data_size) != 0) - return -1; - - if(ngtcp2_conn_set_remote_transport_params(qs->qconn, ¶ms) != 0) - return -1; - - return 0; -} - -static int tp_send_func(gnutls_session_t ssl, gnutls_buffer_t extdata) -{ - struct quicsocket *qs = gnutls_session_get_ptr(ssl); - uint8_t paramsbuf[64]; - ngtcp2_transport_params params; - ssize_t nwrite; - int rc; - - ngtcp2_conn_get_local_transport_params(qs->qconn, ¶ms); - nwrite = ngtcp2_encode_transport_params( - paramsbuf, sizeof(paramsbuf), NGTCP2_TRANSPORT_PARAMS_TYPE_CLIENT_HELLO, - ¶ms); - if(nwrite < 0) { - H3BUGF(fprintf(stderr, "ngtcp2_encode_transport_params: %s\n", - ngtcp2_strerror((int)nwrite))); - return -1; - } - - rc = gnutls_buffer_append_data(extdata, paramsbuf, nwrite); - if(rc < 0) - return rc; - - return (int)nwrite; -} - static int quic_init_ssl(struct quicsocket *qs) { gnutls_datum_t alpn[2]; @@ -478,26 +336,17 @@ static int quic_init_ssl(struct quicsocket *qs) DEBUGASSERT(!qs->ssl); gnutls_init(&qs->ssl, GNUTLS_CLIENT); - gnutls_session_set_ptr(qs->ssl, qs); + gnutls_session_set_ptr(qs->ssl, &qs->conn_ref); - rc = gnutls_priority_set_direct(qs->ssl, QUIC_PRIORITY, NULL); - if(rc < 0) { - H3BUGF(fprintf(stderr, "gnutls_priority_set_direct failed: %s\n", - gnutls_strerror(rc))); + if(ngtcp2_crypto_gnutls_configure_client_session(qs->ssl) != 0) { + H3BUGF(fprintf(stderr, + "ngtcp2_crypto_gnutls_configure_client_session failed\n")); return 1; } - gnutls_handshake_set_secret_function(qs->ssl, secret_func); - gnutls_handshake_set_read_function(qs->ssl, read_func); - gnutls_alert_set_read_function(qs->ssl, alert_read_func); - - rc = gnutls_session_ext_register(qs->ssl, "QUIC Transport Parameters", - NGTCP2_TLSEXT_QUIC_TRANSPORT_PARAMETERS_V1, GNUTLS_EXT_TLS, - tp_recv_func, tp_send_func, NULL, NULL, NULL, - GNUTLS_EXT_FLAG_TLS | GNUTLS_EXT_FLAG_CLIENT_HELLO | - GNUTLS_EXT_FLAG_EE); + rc = gnutls_priority_set_direct(qs->ssl, QUIC_PRIORITY, NULL); if(rc < 0) { - H3BUGF(fprintf(stderr, "gnutls_session_ext_register failed: %s\n", + H3BUGF(fprintf(stderr, "gnutls_priority_set_direct failed: %s\n", gnutls_strerror(rc))); return 1; } @@ -571,7 +420,7 @@ static int cb_recv_stream_data(ngtcp2_conn *tconn, uint32_t flags, void *user_data, void *stream_user_data) { struct quicsocket *qs = (struct quicsocket *)user_data; - ssize_t nconsumed; + nghttp3_ssize nconsumed; int fin = (flags & NGTCP2_STREAM_DATA_FLAG_FIN) ? 1 : 0; (void)offset; (void)stream_user_data; @@ -579,6 +428,9 @@ static int cb_recv_stream_data(ngtcp2_conn *tconn, uint32_t flags, nconsumed = nghttp3_conn_read_stream(qs->h3conn, stream_id, buf, buflen, fin); if(nconsumed < 0) { + ngtcp2_connection_close_error_set_application_error( + &qs->last_error, nghttp3_err_infer_quic_app_error_code((int)nconsumed), + NULL, 0); return NGTCP2_ERR_CALLBACK_FAILURE; } @@ -629,6 +481,8 @@ static int cb_stream_close(ngtcp2_conn *tconn, uint32_t flags, rv = nghttp3_conn_close_stream(qs->h3conn, stream_id, app_error_code); if(rv) { + ngtcp2_connection_close_error_set_application_error( + &qs->last_error, nghttp3_err_infer_quic_app_error_code(rv), NULL, 0); return NGTCP2_ERR_CALLBACK_FAILURE; } @@ -735,6 +589,23 @@ static int cb_get_new_connection_id(ngtcp2_conn *tconn, ngtcp2_cid *cid, return 0; } +static int cb_recv_rx_key(ngtcp2_conn *tconn, ngtcp2_crypto_level level, + void *user_data) +{ + struct quicsocket *qs = (struct quicsocket *)user_data; + (void)tconn; + + if(level != NGTCP2_CRYPTO_LEVEL_APPLICATION) { + return 0; + } + + if(init_ngh3_conn(qs) != CURLE_OK) { + return NGTCP2_ERR_CALLBACK_FAILURE; + } + + return 0; +} + static ngtcp2_callbacks ng_callbacks = { ngtcp2_crypto_client_initial_cb, NULL, /* recv_client_initial */ @@ -773,6 +644,8 @@ static ngtcp2_callbacks ng_callbacks = { ngtcp2_crypto_get_path_challenge_data_cb, cb_stream_stop_sending, NULL, /* version_negotiation */ + cb_recv_rx_key, + NULL, /* recv_tx_key */ }; /* @@ -855,6 +728,29 @@ CURLcode Curl_quic_connect(struct Curl_easy *data, ngtcp2_conn_set_tls_native_handle(qs->qconn, qs->ssl); + ngtcp2_connection_close_error_default(&qs->last_error); + +#if defined(__linux__) && defined(UDP_SEGMENT) && defined(HAVE_SENDMSG) + qs->no_gso = FALSE; +#else + qs->no_gso = TRUE; +#endif + + qs->num_blocked_pkt = 0; + qs->num_blocked_pkt_sent = 0; + memset(&qs->blocked_pkt, 0, sizeof(qs->blocked_pkt)); + + qs->pktbuflen = NGTCP2_MAX_PMTUD_UDP_PAYLOAD_SIZE * MAX_PKT_BURST; + qs->pktbuf = malloc(qs->pktbuflen); + if(!qs->pktbuf) { + ngtcp2_conn_del(qs->qconn); + qs->qconn = NULL; + return CURLE_OUT_OF_MEMORY; + } + + qs->conn_ref.get_conn = get_conn; + qs->conn_ref.user_data = qs; + return CURLE_OK; } @@ -899,18 +795,14 @@ static void qs_disconnect(struct quicsocket *qs) char buffer[NGTCP2_MAX_UDP_PAYLOAD_SIZE]; ngtcp2_tstamp ts; ngtcp2_ssize rc; - ngtcp2_connection_close_error errorcode; if(!qs->conn) /* already closed */ return; - ngtcp2_connection_close_error_set_application_error(&errorcode, - NGHTTP3_H3_NO_ERROR, - NULL, 0); ts = timestamp(); rc = ngtcp2_conn_write_connection_close(qs->qconn, NULL, /* path */ NULL, /* pkt_info */ (uint8_t *)buffer, sizeof(buffer), - &errorcode, ts); + &qs->last_error, ts); if(rc > 0) { while((send(qs->conn->sock[FIRSTSOCKET], buffer, rc, 0) == -1) && SOCKERRNO == EINTR); @@ -934,6 +826,7 @@ static void qs_disconnect(struct quicsocket *qs) qs->cred = NULL; } #endif + free(qs->pktbuf); nghttp3_conn_del(qs->h3conn); ngtcp2_conn_del(qs->qconn); #ifdef USE_OPENSSL @@ -1368,10 +1261,10 @@ static int cb_h3_acked_stream_data(nghttp3_conn *conn, int64_t stream_id, return 0; } -static ssize_t cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id, - nghttp3_vec *vec, size_t veccnt, - uint32_t *pflags, void *user_data, - void *stream_user_data) +static nghttp3_ssize cb_h3_readfunction(nghttp3_conn *conn, int64_t stream_id, + nghttp3_vec *vec, size_t veccnt, + uint32_t *pflags, void *user_data, + void *stream_user_data) { struct Curl_easy *data = stream_user_data; size_t nread; @@ -1704,7 +1597,17 @@ static CURLcode ng_process_ingress(struct Curl_easy *data, rv = ngtcp2_conn_read_pkt(qs->qconn, &path, &pi, buf, recvd, ts); if(rv) { - /* TODO Send CONNECTION_CLOSE if possible */ + if(!qs->last_error.error_code) { + if(rv == NGTCP2_ERR_CRYPTO) { + ngtcp2_connection_close_error_set_transport_error_tls_alert( + &qs->last_error, ngtcp2_conn_get_tls_alert(qs->qconn), NULL, 0); + } + else { + ngtcp2_connection_close_error_set_transport_error_liberr( + &qs->last_error, rv, NULL, 0); + } + } + if(rv == NGTCP2_ERR_CRYPTO) /* this is a "TLS problem", but a failed certificate verification is a common reason for this */ @@ -1716,32 +1619,229 @@ static CURLcode ng_process_ingress(struct Curl_easy *data, return CURLE_OK; } +static CURLcode do_sendmsg(size_t *sent, struct Curl_easy *data, int sockfd, + struct quicsocket *qs, const uint8_t *pkt, + size_t pktlen, size_t gsolen); + +static CURLcode send_packet_no_gso(size_t *psent, struct Curl_easy *data, + int sockfd, struct quicsocket *qs, + const uint8_t *pkt, size_t pktlen, + size_t gsolen) +{ + const uint8_t *p, *end = pkt + pktlen; + size_t sent; + + *psent = 0; + + for(p = pkt; p < end; p += gsolen) { + size_t len = CURLMIN(gsolen, (size_t)(end - p)); + CURLcode curlcode = do_sendmsg(&sent, data, sockfd, qs, p, len, len); + if(curlcode != CURLE_OK) { + return curlcode; + } + *psent += sent; + } + + return CURLE_OK; +} + +static CURLcode do_sendmsg(size_t *psent, struct Curl_easy *data, int sockfd, + struct quicsocket *qs, const uint8_t *pkt, + size_t pktlen, size_t gsolen) +{ +#ifdef HAVE_SENDMSG + struct iovec msg_iov = {(void *)pkt, pktlen}; + struct msghdr msg = {0}; + uint8_t msg_ctrl[32]; + ssize_t sent; +#if defined(__linux__) && defined(UDP_SEGMENT) + struct cmsghdr *cm; +#endif + + *psent = 0; + msg.msg_iov = &msg_iov; + msg.msg_iovlen = 1; + +#if defined(__linux__) && defined(UDP_SEGMENT) + if(pktlen > gsolen) { + /* Only set this, when we need it. macOS, for example, + * does not seem to like a msg_control of length 0. */ + msg.msg_control = msg_ctrl; + assert(sizeof(msg_ctrl) >= CMSG_SPACE(sizeof(uint16_t))); + msg.msg_controllen = CMSG_SPACE(sizeof(uint16_t)); + cm = CMSG_FIRSTHDR(&msg); + cm->cmsg_level = SOL_UDP; + cm->cmsg_type = UDP_SEGMENT; + cm->cmsg_len = CMSG_LEN(sizeof(uint16_t)); + *(uint16_t *)(void *)CMSG_DATA(cm) = gsolen & 0xffff; + } +#endif + + + while((sent = sendmsg(sockfd, &msg, 0)) == -1 && SOCKERRNO == EINTR) + ; + + if(sent == -1) { + switch(SOCKERRNO) { + case EAGAIN: +#if EAGAIN != EWOULDBLOCK + case EWOULDBLOCK: +#endif + return CURLE_AGAIN; + case EMSGSIZE: + /* UDP datagram is too large; caused by PMTUD. Just let it be lost. */ + break; + case EIO: + if(pktlen > gsolen) { + /* GSO failure */ + failf(data, "sendmsg() returned %zd (errno %d); disable GSO", sent, + SOCKERRNO); + qs->no_gso = TRUE; + return send_packet_no_gso(psent, data, sockfd, qs, pkt, pktlen, + gsolen); + } + /* FALLTHROUGH */ + default: + failf(data, "sendmsg() returned %zd (errno %d)", sent, SOCKERRNO); + return CURLE_SEND_ERROR; + } + } + else { + assert(pktlen == (size_t)sent); + } +#else + ssize_t sent; + (void)qs; + (void)gsolen; + + *psent = 0; + + while((sent = send(sockfd, (const char *)pkt, pktlen, 0)) == -1 && + SOCKERRNO == EINTR) + ; + + if(sent == -1) { + if(SOCKERRNO == EAGAIN || SOCKERRNO == EWOULDBLOCK) { + return CURLE_AGAIN; + } + else { + failf(data, "send() returned %zd (errno %d)", sent, SOCKERRNO); + if(SOCKERRNO != EMSGSIZE) { + return CURLE_SEND_ERROR; + } + /* UDP datagram is too large; caused by PMTUD. Just let it be + lost. */ + } + } +#endif + + *psent = pktlen; + + return CURLE_OK; +} + +static CURLcode send_packet(size_t *psent, struct Curl_easy *data, int sockfd, + struct quicsocket *qs, const uint8_t *pkt, + size_t pktlen, size_t gsolen) +{ + if(qs->no_gso && pktlen > gsolen) { + return send_packet_no_gso(psent, data, sockfd, qs, pkt, pktlen, gsolen); + } + + return do_sendmsg(psent, data, sockfd, qs, pkt, pktlen, gsolen); +} + +static void push_blocked_pkt(struct quicsocket *qs, const uint8_t *pkt, + size_t pktlen, size_t gsolen) +{ + struct blocked_pkt *blkpkt; + + assert(qs->num_blocked_pkt < + sizeof(qs->blocked_pkt) / sizeof(qs->blocked_pkt[0])); + + blkpkt = &qs->blocked_pkt[qs->num_blocked_pkt++]; + + blkpkt->pkt = pkt; + blkpkt->pktlen = pktlen; + blkpkt->gsolen = gsolen; +} + +static CURLcode send_blocked_pkt(struct Curl_easy *data, int sockfd, + struct quicsocket *qs) +{ + size_t sent; + CURLcode curlcode; + struct blocked_pkt *blkpkt; + + for(; qs->num_blocked_pkt_sent < qs->num_blocked_pkt; + ++qs->num_blocked_pkt_sent) { + blkpkt = &qs->blocked_pkt[qs->num_blocked_pkt_sent]; + curlcode = send_packet(&sent, data, sockfd, qs, blkpkt->pkt, + blkpkt->pktlen, blkpkt->gsolen); + + if(curlcode) { + if(curlcode == CURLE_AGAIN) { + blkpkt->pkt += sent; + blkpkt->pktlen -= sent; + } + return curlcode; + } + } + + qs->num_blocked_pkt = 0; + qs->num_blocked_pkt_sent = 0; + + return CURLE_OK; +} + static CURLcode ng_flush_egress(struct Curl_easy *data, int sockfd, struct quicsocket *qs) { int rv; - ssize_t sent; - ssize_t outlen; - uint8_t out[NGTCP2_MAX_UDP_PAYLOAD_SIZE]; + size_t sent; + ngtcp2_ssize outlen; + uint8_t *outpos = qs->pktbuf; + size_t max_udp_payload_size = + ngtcp2_conn_get_max_udp_payload_size(qs->qconn); + size_t path_max_udp_payload_size = + ngtcp2_conn_get_path_max_udp_payload_size(qs->qconn); + size_t max_pktcnt = + CURLMIN(MAX_PKT_BURST, qs->pktbuflen / max_udp_payload_size); + size_t pktcnt = 0; + size_t gsolen; ngtcp2_path_storage ps; ngtcp2_tstamp ts = timestamp(); ngtcp2_tstamp expiry; ngtcp2_duration timeout; int64_t stream_id; - ssize_t veccnt; + nghttp3_ssize veccnt; int fin; nghttp3_vec vec[16]; - ssize_t ndatalen; + ngtcp2_ssize ndatalen; uint32_t flags; + CURLcode curlcode; rv = ngtcp2_conn_handle_expiry(qs->qconn, ts); if(rv) { failf(data, "ngtcp2_conn_handle_expiry returned error: %s", ngtcp2_strerror(rv)); + ngtcp2_connection_close_error_set_transport_error_liberr(&qs->last_error, + rv, NULL, 0); return CURLE_SEND_ERROR; } + if(qs->num_blocked_pkt) { + curlcode = send_blocked_pkt(data, sockfd, qs); + if(curlcode) { + if(curlcode == CURLE_AGAIN) { + Curl_expire(data, 1, EXPIRE_QUIC); + return CURLE_OK; + } + return curlcode; + } + } + ngtcp2_path_storage_zero(&ps); for(;;) { @@ -1755,17 +1855,34 @@ static CURLcode ng_flush_egress(struct Curl_easy *data, if(veccnt < 0) { failf(data, "nghttp3_conn_writev_stream returned error: %s", nghttp3_strerror((int)veccnt)); + ngtcp2_connection_close_error_set_application_error( + &qs->last_error, + nghttp3_err_infer_quic_app_error_code((int)veccnt), NULL, 0); return CURLE_SEND_ERROR; } } flags = NGTCP2_WRITE_STREAM_FLAG_MORE | (fin ? NGTCP2_WRITE_STREAM_FLAG_FIN : 0); - outlen = ngtcp2_conn_writev_stream(qs->qconn, &ps.path, NULL, out, - sizeof(out), + outlen = ngtcp2_conn_writev_stream(qs->qconn, &ps.path, NULL, outpos, + max_udp_payload_size, &ndatalen, flags, stream_id, (const ngtcp2_vec *)vec, veccnt, ts); if(outlen == 0) { + if(outpos != qs->pktbuf) { + curlcode = send_packet(&sent, data, sockfd, qs, qs->pktbuf, + outpos - qs->pktbuf, gsolen); + if(curlcode) { + if(curlcode == CURLE_AGAIN) { + push_blocked_pkt(qs, qs->pktbuf + sent, outpos - qs->pktbuf - sent, + gsolen); + Curl_expire(data, 1, EXPIRE_QUIC); + return CURLE_OK; + } + return curlcode; + } + } + break; } if(outlen < 0) { @@ -1802,6 +1919,8 @@ static CURLcode ng_flush_egress(struct Curl_easy *data, assert(ndatalen == -1); failf(data, "ngtcp2_conn_writev_stream returned error: %s", ngtcp2_strerror((int)outlen)); + ngtcp2_connection_close_error_set_transport_error_liberr( + &qs->last_error, (int)outlen, NULL, 0); return CURLE_SEND_ERROR; } } @@ -1814,20 +1933,61 @@ static CURLcode ng_flush_egress(struct Curl_easy *data, } } - while((sent = send(sockfd, (const char *)out, outlen, 0)) == -1 && - SOCKERRNO == EINTR) - ; + outpos += outlen; - if(sent == -1) { - if(SOCKERRNO == EAGAIN || SOCKERRNO == EWOULDBLOCK) { - /* TODO Cache packet */ - break; + if(pktcnt == 0) { + gsolen = outlen; + } + else if((size_t)outlen > gsolen || + (gsolen > path_max_udp_payload_size && + (size_t)outlen != gsolen)) { + /* Packet larger than path_max_udp_payload_size is PMTUD probe + packet and it might not be sent because of EMSGSIZE. Send + them separately to minimize the loss. */ + curlcode = send_packet(&sent, data, sockfd, qs, qs->pktbuf, + outpos - outlen - qs->pktbuf, gsolen); + if(curlcode) { + if(curlcode == CURLE_AGAIN) { + push_blocked_pkt(qs, qs->pktbuf + sent, + outpos - outlen - qs->pktbuf - sent, gsolen); + push_blocked_pkt(qs, outpos - outlen, outlen, outlen); + Curl_expire(data, 1, EXPIRE_QUIC); + return CURLE_OK; + } + return curlcode; } - else { - failf(data, "send() returned %zd (errno %d)", sent, - SOCKERRNO); - return CURLE_SEND_ERROR; + curlcode = send_packet(&sent, data, sockfd, qs, outpos - outlen, outlen, + outlen); + if(curlcode) { + if(curlcode == CURLE_AGAIN) { + assert(0 == sent); + push_blocked_pkt(qs, outpos - outlen, outlen, outlen); + Curl_expire(data, 1, EXPIRE_QUIC); + return CURLE_OK; + } + return curlcode; } + + pktcnt = 0; + outpos = qs->pktbuf; + continue; + } + + if(++pktcnt >= max_pktcnt || (size_t)outlen < gsolen) { + curlcode = send_packet(&sent, data, sockfd, qs, qs->pktbuf, + outpos - qs->pktbuf, gsolen); + if(curlcode) { + if(curlcode == CURLE_AGAIN) { + push_blocked_pkt(qs, qs->pktbuf + sent, outpos - qs->pktbuf - sent, + gsolen); + Curl_expire(data, 1, EXPIRE_QUIC); + return CURLE_OK; + } + return curlcode; + } + + pktcnt = 0; + outpos = qs->pktbuf; } } @@ -1894,4 +2054,26 @@ bool Curl_quic_data_pending(const struct Curl_easy *data) return Curl_dyn_len(&stream->overflow) > 0; } +/* + * Called from transfer.c:Curl_readwrite when neither HTTP level read + * nor write is performed. It is a good place to handle timer expiry + * for QUIC transport. + */ +CURLcode Curl_quic_idle(struct Curl_easy *data) +{ + struct connectdata *conn = data->conn; + curl_socket_t sockfd = conn->sock[FIRSTSOCKET]; + struct quicsocket *qs = conn->quic; + + if(ngtcp2_conn_get_expiry(qs->qconn) > timestamp()) { + return CURLE_OK; + } + + if(ng_flush_egress(data, sockfd, qs)) { + return CURLE_SEND_ERROR; + } + + return CURLE_OK; +} + #endif diff --git a/libs/libcurl/src/vquic/ngtcp2.h b/libs/libcurl/src/vquic/ngtcp2.h index 501453042b..23fbcb66df 100644 --- a/libs/libcurl/src/vquic/ngtcp2.h +++ b/libs/libcurl/src/vquic/ngtcp2.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,13 +20,19 @@ * 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_NGTCP2 -#include <ngtcp2/ngtcp2.h> +#ifdef HAVE_NETINET_UDP_H +#include <netinet/udp.h> +#endif + +#include <ngtcp2/ngtcp2_crypto.h> #include <nghttp3/nghttp3.h> #ifdef USE_OPENSSL #include <openssl/ssl.h> @@ -34,6 +40,12 @@ #include <gnutls/gnutls.h> #endif +struct blocked_pkt { + const uint8_t *pkt; + size_t pktlen; + size_t gsolen; +}; + struct quicsocket { struct connectdata *conn; /* point back to the connection */ ngtcp2_conn *qconn; @@ -42,6 +54,8 @@ struct quicsocket { uint32_t version; ngtcp2_settings settings; ngtcp2_transport_params transport_params; + ngtcp2_connection_close_error last_error; + ngtcp2_crypto_conn_ref conn_ref; #ifdef USE_OPENSSL SSL_CTX *sslctx; SSL *ssl; @@ -49,10 +63,17 @@ struct quicsocket { gnutls_certificate_credentials_t cred; gnutls_session_t ssl; #endif - /* the last TLS alert description generated by the local endpoint */ - uint8_t tls_alert; struct sockaddr_storage local_addr; socklen_t local_addrlen; + bool no_gso; + uint8_t *pktbuf; + size_t pktbuflen; + /* the number of entries in blocked_pkt */ + size_t num_blocked_pkt; + /* the number of processed entries in blocked_pkt */ + size_t num_blocked_pkt_sent; + /* the packets blocked by sendmsg (EAGAIN or EWOULDBLOCK) */ + struct blocked_pkt blocked_pkt[2]; nghttp3_conn *h3conn; nghttp3_settings h3settings; diff --git a/libs/libcurl/src/vquic/quiche.c b/libs/libcurl/src/vquic/quiche.c index bfdc966a85..9a2b74310a 100644 --- a/libs/libcurl/src/vquic/quiche.c +++ b/libs/libcurl/src/vquic/quiche.c @@ -18,6 +18,8 @@ * 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" @@ -201,23 +203,31 @@ static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) { struct connectdata *conn = data->conn; - const char * const ssl_cafile = conn->ssl_config.CAfile; - const char * const ssl_capath = conn->ssl_config.CApath; - if(conn->ssl_config.verifypeer) { - SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); - /* tell OpenSSL where to find CA certificates that are used to verify - the server's certificate. */ - if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { - /* Fail if we insist on successfully verifying the server. */ - failf(data, "error setting certificate verify locations:" - " CAfile: %s CApath: %s", - ssl_cafile ? ssl_cafile : "none", - ssl_capath ? ssl_capath : "none"); - return NULL; + const char * const ssl_cafile = conn->ssl_config.CAfile; + const char * const ssl_capath = conn->ssl_config.CApath; + if(ssl_cafile || ssl_capath) { + SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); + /* tell OpenSSL where to find CA certificates that are used to verify + the server's certificate. */ + if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { + /* Fail if we insist on successfully verifying the server. */ + failf(data, "error setting certificate verify locations:" + " CAfile: %s CApath: %s", + ssl_cafile ? ssl_cafile : "none", + ssl_capath ? ssl_capath : "none"); + return NULL; + } + infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); + infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); } - infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); - infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); +#ifdef CURL_CA_FALLBACK + else { + /* verifying the peer without any CA certificates won't work so + use openssl's built-in default as fallback */ + SSL_CTX_set_default_verify_paths(ssl_ctx); + } +#endif } } return ssl_ctx; @@ -856,4 +866,15 @@ bool Curl_quic_data_pending(const struct Curl_easy *data) return FALSE; } +/* + * Called from transfer.c:Curl_readwrite when neither HTTP level read + * nor write is performed. It is a good place to handle timer expiry + * for QUIC transport. + */ +CURLcode Curl_quic_idle(struct Curl_easy *data) +{ + (void)data; + return CURLE_OK; +} + #endif diff --git a/libs/libcurl/src/vquic/quiche.h b/libs/libcurl/src/vquic/quiche.h index 759a20bbac..de68089451 100644 --- a/libs/libcurl/src/vquic/quiche.h +++ b/libs/libcurl/src/vquic/quiche.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vquic/vquic.c b/libs/libcurl/src/vquic/vquic.c index be2a65f454..e52a4f301d 100644 --- a/libs/libcurl/src/vquic/vquic.c +++ b/libs/libcurl/src/vquic/vquic.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vquic/vquic.h b/libs/libcurl/src/vquic/vquic.h index 3df138f10e..8f599a8f49 100644 --- a/libs/libcurl/src/vquic/vquic.h +++ b/libs/libcurl/src/vquic/vquic.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vssh/libssh.c b/libs/libcurl/src/vssh/libssh.c index 7bf2b04176..5aa99e618b 100644 --- a/libs/libcurl/src/vssh/libssh.c +++ b/libs/libcurl/src/vssh/libssh.c @@ -21,6 +21,8 @@ * 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" @@ -1970,10 +1972,13 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block) } ssh_disconnect(sshc->ssh_session); - /* conn->sock[FIRSTSOCKET] is closed by ssh_disconnect behind our back, - explicitly mark it as closed with the memdebug macro: */ - fake_sclose(conn->sock[FIRSTSOCKET]); - conn->sock[FIRSTSOCKET] = CURL_SOCKET_BAD; + if(!ssh_version(SSH_VERSION_INT(0, 10, 0))) { + /* conn->sock[FIRSTSOCKET] is closed by ssh_disconnect behind our back, + explicitly mark it as closed with the memdebug macro. This libssh + bug is fixed in 0.10.0. */ + fake_sclose(conn->sock[FIRSTSOCKET]); + conn->sock[FIRSTSOCKET] = CURL_SOCKET_BAD; + } SSH_STRING_FREE_CHAR(sshc->homedir); data->state.most_recent_ftp_entrypath = NULL; @@ -2956,7 +2961,7 @@ void Curl_ssh_cleanup(void) void Curl_ssh_version(char *buffer, size_t buflen) { - (void)msnprintf(buffer, buflen, "libssh/%s", CURL_LIBSSH_VERSION); + (void)msnprintf(buffer, buflen, "libssh/%s", ssh_version(0)); } #endif /* USE_LIBSSH */ diff --git a/libs/libcurl/src/vssh/libssh2.c b/libs/libcurl/src/vssh/libssh2.c index d269263864..2026a88e5d 100644 --- a/libs/libcurl/src/vssh/libssh2.c +++ b/libs/libcurl/src/vssh/libssh2.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* #define CURL_LIBSSH2_DEBUG */ @@ -437,9 +439,45 @@ static int sshkeycallback(struct Curl_easy *easy, #else #define session_startup(x,y) libssh2_session_startup(x, (int)y) #endif +static int convert_ssh2_keytype(int sshkeytype) +{ + int keytype = CURLKHTYPE_UNKNOWN; + switch(sshkeytype) { + case LIBSSH2_HOSTKEY_TYPE_RSA: + keytype = CURLKHTYPE_RSA; + break; + case LIBSSH2_HOSTKEY_TYPE_DSS: + keytype = CURLKHTYPE_DSS; + break; +#ifdef LIBSSH2_HOSTKEY_TYPE_ECDSA_256 + case LIBSSH2_HOSTKEY_TYPE_ECDSA_256: + keytype = CURLKHTYPE_ECDSA; + break; +#endif +#ifdef LIBSSH2_HOSTKEY_TYPE_ECDSA_384 + case LIBSSH2_HOSTKEY_TYPE_ECDSA_384: + keytype = CURLKHTYPE_ECDSA; + break; +#endif +#ifdef LIBSSH2_HOSTKEY_TYPE_ECDSA_521 + case LIBSSH2_HOSTKEY_TYPE_ECDSA_521: + keytype = CURLKHTYPE_ECDSA; + break; +#endif +#ifdef LIBSSH2_HOSTKEY_TYPE_ED25519 + case LIBSSH2_HOSTKEY_TYPE_ED25519: + keytype = CURLKHTYPE_ED25519; + break; +#endif + } + return keytype; +} static CURLcode ssh_knownhost(struct Curl_easy *data) { + int sshkeytype = 0; + size_t keylen = 0; + int rc = 0; CURLcode result = CURLE_OK; #ifdef HAVE_LIBSSH2_KNOWNHOST_API @@ -448,11 +486,8 @@ static CURLcode ssh_knownhost(struct Curl_easy *data) struct connectdata *conn = data->conn; struct ssh_conn *sshc = &conn->proto.sshc; struct libssh2_knownhost *host = NULL; - int rc; - int keytype; - size_t keylen; const char *remotekey = libssh2_session_hostkey(sshc->ssh_session, - &keylen, &keytype); + &keylen, &sshkeytype); int keycheck = LIBSSH2_KNOWNHOST_CHECK_FAILURE; int keybit = 0; @@ -464,12 +499,12 @@ static CURLcode ssh_knownhost(struct Curl_easy *data) */ enum curl_khmatch keymatch; curl_sshkeycallback func = - data->set.ssh_keyfunc?data->set.ssh_keyfunc:sshkeycallback; + data->set.ssh_keyfunc ? data->set.ssh_keyfunc : sshkeycallback; struct curl_khkey knownkey; struct curl_khkey *knownkeyp = NULL; struct curl_khkey foundkey; - switch(keytype) { + switch(sshkeytype) { case LIBSSH2_HOSTKEY_TYPE_RSA: keybit = LIBSSH2_KNOWNHOST_KEY_SSHRSA; break; @@ -533,16 +568,14 @@ static CURLcode ssh_knownhost(struct Curl_easy *data) if(keycheck <= LIBSSH2_KNOWNHOST_CHECK_MISMATCH) { knownkey.key = host->key; knownkey.len = 0; - knownkey.keytype = (keytype == LIBSSH2_HOSTKEY_TYPE_RSA)? - CURLKHTYPE_RSA : CURLKHTYPE_DSS; + knownkey.keytype = convert_ssh2_keytype(sshkeytype); knownkeyp = &knownkey; } /* setup 'foundkey' */ foundkey.key = remotekey; foundkey.len = keylen; - foundkey.keytype = (keytype == LIBSSH2_HOSTKEY_TYPE_RSA)? - CURLKHTYPE_RSA : CURLKHTYPE_DSS; + foundkey.keytype = convert_ssh2_keytype(sshkeytype); /* * if any of the LIBSSH2_KNOWNHOST_CHECK_* defines and the @@ -639,7 +672,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data) #ifdef LIBSSH2_HOSTKEY_HASH_SHA256 /* The fingerprint points to static storage (!), don't free() it. */ fingerprint = libssh2_hostkey_hash(sshc->ssh_session, - LIBSSH2_HOSTKEY_HASH_SHA256); + LIBSSH2_HOSTKEY_HASH_SHA256); #else const char *hostkey; size_t len = 0; @@ -654,8 +687,8 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data) if(!fingerprint) { failf(data, - "Denied establishing ssh session: sha256 fingerprint " - "not available"); + "Denied establishing ssh session: sha256 fingerprint " + "not available"); state(data, SSH_SESSION_FREE); sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION; return sshc->actualcode; @@ -715,7 +748,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data) const char *fingerprint = NULL; fingerprint = libssh2_hostkey_hash(sshc->ssh_session, - LIBSSH2_HOSTKEY_HASH_MD5); + LIBSSH2_HOSTKEY_HASH_MD5); if(fingerprint) { /* The fingerprint points to static storage (!), don't free() it. */ @@ -748,7 +781,31 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data) } if(!pubkey_md5 && !pubkey_sha256) { - return ssh_knownhost(data); + if(data->set.ssh_hostkeyfunc) { + size_t keylen = 0; + int sshkeytype = 0; + int rc = 0; + /* we handle the process to the callback*/ + const char *remotekey = libssh2_session_hostkey(sshc->ssh_session, + &keylen, &sshkeytype); + if(remotekey) { + int keytype = convert_ssh2_keytype(sshkeytype); + Curl_set_in_callback(data, true); + rc = data->set.ssh_hostkeyfunc(data->set.ssh_hostkeyfunc_userp, + keytype, remotekey, keylen); + Curl_set_in_callback(data, false); + if(rc!= CURLKHMATCH_OK) { + state(data, SSH_SESSION_FREE); + } + } + else { + state(data, SSH_SESSION_FREE); + } + return CURLE_OK; + } + else { + return ssh_knownhost(data); + } } else { /* as we already matched, we skip the check for known hosts */ diff --git a/libs/libcurl/src/vssh/ssh.h b/libs/libcurl/src/vssh/ssh.h index 30d82e5764..7e1d8159cb 100644 --- a/libs/libcurl/src/vssh/ssh.h +++ b/libs/libcurl/src/vssh/ssh.h @@ -20,6 +20,8 @@ * 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" @@ -209,11 +211,7 @@ struct ssh_conn { #endif /* USE_LIBSSH */ }; -#if defined(USE_LIBSSH) - -#define CURL_LIBSSH_VERSION ssh_version(0) - -#elif defined(USE_LIBSSH2) +#if defined(USE_LIBSSH2) /* Feature detection based on version numbers to better work with non-configure platforms */ diff --git a/libs/libcurl/src/vssh/wolfssh.c b/libs/libcurl/src/vssh/wolfssh.c index 85f2941966..c2f85f3fe5 100644 --- a/libs/libcurl/src/vssh/wolfssh.c +++ b/libs/libcurl/src/vssh/wolfssh.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/bearssl.c b/libs/libcurl/src/vtls/bearssl.c index 91f4416e8f..f14eb66a20 100644 --- a/libs/libcurl/src/vtls/bearssl.c +++ b/libs/libcurl/src/vtls/bearssl.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/bearssl.h b/libs/libcurl/src/vtls/bearssl.h index d72b7d0e26..5125359961 100644 --- a/libs/libcurl/src/vtls/bearssl.h +++ b/libs/libcurl/src/vtls/bearssl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2019 - 2020, Michael Forney, <mforney@mforney.org> + * Copyright (C) 2019 - 2022, Michael Forney, <mforney@mforney.org> * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/gskit.c b/libs/libcurl/src/vtls/gskit.c index 7a65f92f20..4ee4edea6c 100644 --- a/libs/libcurl/src/vtls/gskit.c +++ b/libs/libcurl/src/vtls/gskit.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/gskit.h b/libs/libcurl/src/vtls/gskit.h index 202df7e07c..cf923f6b85 100644 --- a/libs/libcurl/src/vtls/gskit.h +++ b/libs/libcurl/src/vtls/gskit.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/gtls.c b/libs/libcurl/src/vtls/gtls.c index dd82755852..e2d41f4102 100644 --- a/libs/libcurl/src/vtls/gtls.c +++ b/libs/libcurl/src/vtls/gtls.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/vtls/gtls.h b/libs/libcurl/src/vtls/gtls.h index 642d5f093a..abade73f80 100644 --- a/libs/libcurl/src/vtls/gtls.h +++ b/libs/libcurl/src/vtls/gtls.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/hostcheck.c b/libs/libcurl/src/vtls/hostcheck.c index 8dc97a27d0..2a648f20a9 100644 --- a/libs/libcurl/src/vtls/hostcheck.c +++ b/libs/libcurl/src/vtls/hostcheck.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/hostcheck.h b/libs/libcurl/src/vtls/hostcheck.h index aa966403dd..d3c4eab56d 100644 --- a/libs/libcurl/src/vtls/hostcheck.h +++ b/libs/libcurl/src/vtls/hostcheck.h @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include <curl/curl.h> diff --git a/libs/libcurl/src/vtls/keylog.c b/libs/libcurl/src/vtls/keylog.c index a45945f8f5..7471217921 100644 --- a/libs/libcurl/src/vtls/keylog.c +++ b/libs/libcurl/src/vtls/keylog.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/keylog.h b/libs/libcurl/src/vtls/keylog.h index 63626da90a..5d3c675b3e 100644 --- a/libs/libcurl/src/vtls/keylog.h +++ b/libs/libcurl/src/vtls/keylog.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/mbedtls.c b/libs/libcurl/src/vtls/mbedtls.c index b60b9cac50..ad9bd10f8a 100644 --- a/libs/libcurl/src/vtls/mbedtls.c +++ b/libs/libcurl/src/vtls/mbedtls.c @@ -19,6 +19,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/vtls/mbedtls.h b/libs/libcurl/src/vtls/mbedtls.h index 1abd331ea9..ec3b43bf9c 100644 --- a/libs/libcurl/src/vtls/mbedtls.h +++ b/libs/libcurl/src/vtls/mbedtls.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2010, Hoi-Ho Chan, <hoiho.chan@gmail.com> * * This software is licensed as described in the file COPYING, which @@ -21,6 +21,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/mbedtls_threadlock.c b/libs/libcurl/src/vtls/mbedtls_threadlock.c index 751755c239..3971e69b25 100644 --- a/libs/libcurl/src/vtls/mbedtls_threadlock.c +++ b/libs/libcurl/src/vtls/mbedtls_threadlock.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2013 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2013 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> * * This software is licensed as described in the file COPYING, which @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/mbedtls_threadlock.h b/libs/libcurl/src/vtls/mbedtls_threadlock.h index e40dfc8d6a..3a50d03817 100644 --- a/libs/libcurl/src/vtls/mbedtls_threadlock.h +++ b/libs/libcurl/src/vtls/mbedtls_threadlock.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2013 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2013 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2010, Hoi-Ho Chan, <hoiho.chan@gmail.com> * * This software is licensed as described in the file COPYING, which @@ -21,6 +21,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/nss.c b/libs/libcurl/src/vtls/nss.c index cb0509ff5b..9d3a8584c9 100644 --- a/libs/libcurl/src/vtls/nss.c +++ b/libs/libcurl/src/vtls/nss.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/vtls/nssg.h b/libs/libcurl/src/vtls/nssg.h index 37b364647b..454a38f1fb 100644 --- a/libs/libcurl/src/vtls/nssg.h +++ b/libs/libcurl/src/vtls/nssg.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/openssl.c b/libs/libcurl/src/vtls/openssl.c index 635e9c15e7..78aacd0228 100644 --- a/libs/libcurl/src/vtls/openssl.c +++ b/libs/libcurl/src/vtls/openssl.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* @@ -484,36 +486,19 @@ static CURLcode ossl_seed(struct Curl_easy *data) return CURLE_SSL_CONNECT_ERROR; #else -#ifndef RANDOM_FILE - /* if RANDOM_FILE isn't defined, we only perform this if an option tells - us to! */ - if(data->set.str[STRING_SSL_RANDOM_FILE]) -#define RANDOM_FILE "" /* doesn't matter won't be used */ +#ifdef RANDOM_FILE + RAND_load_file(RANDOM_FILE, RAND_LOAD_LENGTH); + if(rand_enough()) + return CURLE_OK; #endif - { - /* let the option override the define */ - RAND_load_file((data->set.str[STRING_SSL_RANDOM_FILE]? - data->set.str[STRING_SSL_RANDOM_FILE]: - RANDOM_FILE), - RAND_LOAD_LENGTH); - if(rand_enough()) - return CURLE_OK; - } -#if defined(HAVE_RAND_EGD) - /* only available in OpenSSL 0.9.5 and later */ +#if defined(HAVE_RAND_EGD) && defined(EGD_SOCKET) + /* available in OpenSSL 0.9.5 and later */ /* EGD_SOCKET is set at configure time or not at all */ -#ifndef EGD_SOCKET - /* If we don't have the define set, we only do this if the egd-option - is set */ - if(data->set.str[STRING_SSL_EGDSOCKET]) -#define EGD_SOCKET "" /* doesn't matter won't be used */ -#endif { /* If there's an option and a define, the option overrides the define */ - int ret = RAND_egd(data->set.str[STRING_SSL_EGDSOCKET]? - data->set.str[STRING_SSL_EGDSOCKET]:EGD_SOCKET); + int ret = RAND_egd(EGD_SOCKET); if(-1 != ret) { if(rand_enough()) return CURLE_OK; diff --git a/libs/libcurl/src/vtls/openssl.h b/libs/libcurl/src/vtls/openssl.h index 0a7536ea3e..cb47f4ea81 100644 --- a/libs/libcurl/src/vtls/openssl.h +++ b/libs/libcurl/src/vtls/openssl.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/rustls.c b/libs/libcurl/src/vtls/rustls.c index 16970b7c36..be4af98502 100644 --- a/libs/libcurl/src/vtls/rustls.c +++ b/libs/libcurl/src/vtls/rustls.c @@ -19,6 +19,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/rustls.h b/libs/libcurl/src/vtls/rustls.h index 056211dd8b..6b393dd639 100644 --- a/libs/libcurl/src/vtls/rustls.h +++ b/libs/libcurl/src/vtls/rustls.h @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2020 - 2021, Jacob Hoffman-Andrews, + * Copyright (C) 2020 - 2022, Jacob Hoffman-Andrews, * <github@hoffman-andrews.com> * * This software is licensed as described in the file COPYING, which @@ -19,6 +19,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifndef HEADER_CURL_RUSTLS_H #define HEADER_CURL_RUSTLS_H diff --git a/libs/libcurl/src/vtls/schannel.c b/libs/libcurl/src/vtls/schannel.c index dfec66d51f..7e42285828 100644 --- a/libs/libcurl/src/vtls/schannel.c +++ b/libs/libcurl/src/vtls/schannel.c @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/vtls/schannel.h b/libs/libcurl/src/vtls/schannel.h index da60702771..0b4c4d9344 100644 --- a/libs/libcurl/src/vtls/schannel.h +++ b/libs/libcurl/src/vtls/schannel.h @@ -21,6 +21,8 @@ * 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" @@ -60,7 +62,6 @@ CURLcode Curl_verify_certificate(struct Curl_easy *data, #ifdef EXPOSE_SCHANNEL_INTERNAL_STRUCTS #ifdef __MINGW32__ -#include <_mingw.h> #ifdef __MINGW64_VERSION_MAJOR #define HAS_MANUAL_VERIFY_API #endif diff --git a/libs/libcurl/src/vtls/schannel_verify.c b/libs/libcurl/src/vtls/schannel_verify.c index 4dc2d14e56..1ac1d3eaf5 100644 --- a/libs/libcurl/src/vtls/schannel_verify.c +++ b/libs/libcurl/src/vtls/schannel_verify.c @@ -20,6 +20,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* diff --git a/libs/libcurl/src/vtls/sectransp.c b/libs/libcurl/src/vtls/sectransp.c index 2e57d83785..a18ca4ee9d 100644 --- a/libs/libcurl/src/vtls/sectransp.c +++ b/libs/libcurl/src/vtls/sectransp.c @@ -19,6 +19,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* @@ -2964,7 +2966,7 @@ collect_server_cert(struct Curl_easy *data, private API and doesn't work as expected. So we have to look for a different symbol to make sure this code is only executed under Lion or later. */ - if(SecTrustEvaluateAsync) { + if(SecTrustCopyPublicKey) { #pragma unused(server_certs) err = SSLCopyPeerTrust(backend->ssl_ctx, &trust); /* For some reason, SSLCopyPeerTrust() can return noErr and yet return diff --git a/libs/libcurl/src/vtls/sectransp.h b/libs/libcurl/src/vtls/sectransp.h index 0febd6613a..2d53b7c480 100644 --- a/libs/libcurl/src/vtls/sectransp.h +++ b/libs/libcurl/src/vtls/sectransp.h @@ -8,7 +8,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2012 - 2014, Nick Zitzmann, <nickzman@gmail.com>. - * Copyright (C) 2012 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2022, 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 @@ -21,6 +21,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/vtls.c b/libs/libcurl/src/vtls/vtls.c index e2d34388cc..faa1b51417 100644 --- a/libs/libcurl/src/vtls/vtls.c +++ b/libs/libcurl/src/vtls/vtls.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* This file is for implementing all "generic" SSL functions that all libcurl @@ -143,8 +145,6 @@ Curl_ssl_config_matches(struct ssl_primary_config *data, Curl_safecmp(data->CAfile, needle->CAfile) && Curl_safecmp(data->issuercert, needle->issuercert) && Curl_safecmp(data->clientcert, needle->clientcert) && - Curl_safecmp(data->random_file, needle->random_file) && - Curl_safecmp(data->egdsocket, needle->egdsocket) && #ifdef USE_TLS_SRP Curl_safecmp(data->username, needle->username) && Curl_safecmp(data->password, needle->password) && @@ -182,8 +182,6 @@ Curl_clone_primary_ssl_config(struct ssl_primary_config *source, CLONE_STRING(CAfile); CLONE_STRING(issuercert); CLONE_STRING(clientcert); - CLONE_STRING(random_file); - CLONE_STRING(egdsocket); CLONE_STRING(cipher_list); CLONE_STRING(cipher_list13); CLONE_STRING(pinned_key); @@ -203,8 +201,6 @@ void Curl_free_primary_ssl_config(struct ssl_primary_config *sslc) Curl_safefree(sslc->CAfile); Curl_safefree(sslc->issuercert); Curl_safefree(sslc->clientcert); - Curl_safefree(sslc->random_file); - Curl_safefree(sslc->egdsocket); Curl_safefree(sslc->cipher_list); Curl_safefree(sslc->cipher_list13); Curl_safefree(sslc->pinned_key); @@ -1460,8 +1456,10 @@ static int multissl_setup(const struct Curl_ssl *backend) return 0; } -CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, - const curl_ssl_backend ***avail) +/* This function is used to select the SSL backend to use. It is called by + curl_global_sslset (easy.c) which uses the global init lock. */ +CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name, + const curl_ssl_backend ***avail) { int i; @@ -1490,8 +1488,8 @@ CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, } #else /* USE_SSL */ -CURLsslset curl_global_sslset(curl_sslbackend id, const char *name, - const curl_ssl_backend ***avail) +CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name, + const curl_ssl_backend ***avail) { (void)id; (void)name; diff --git a/libs/libcurl/src/vtls/vtls.h b/libs/libcurl/src/vtls/vtls.h index 6bd1e0dcd3..e1e58f4215 100644 --- a/libs/libcurl/src/vtls/vtls.h +++ b/libs/libcurl/src/vtls/vtls.h @@ -20,6 +20,8 @@ * 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" @@ -123,6 +125,9 @@ struct curl_slist *Curl_none_engines_list(struct Curl_easy *data); bool Curl_none_false_start(void); bool Curl_ssl_tls13_ciphersuites(void); +CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name, + const curl_ssl_backend ***avail); + #include "openssl.h" /* OpenSSL versions */ #include "gtls.h" /* GnuTLS versions */ #include "nssg.h" /* NSS versions */ diff --git a/libs/libcurl/src/vtls/wolfssl.c b/libs/libcurl/src/vtls/wolfssl.c index da8cb82ce2..50cdb4abf0 100644 --- a/libs/libcurl/src/vtls/wolfssl.c +++ b/libs/libcurl/src/vtls/wolfssl.c @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ /* @@ -503,7 +505,7 @@ wolfssl_connect_step1(struct Curl_easy *data, struct connectdata *conn, SSL_free(backend->handle); backend->handle = SSL_new(backend->ctx); if(!backend->handle) { - failf(data, "SSL: couldn't create a context"); + failf(data, "SSL: couldn't create a handle"); return CURLE_OUT_OF_MEMORY; } diff --git a/libs/libcurl/src/vtls/wolfssl.h b/libs/libcurl/src/vtls/wolfssl.h index d411e6913e..b2e7c3fde2 100644 --- a/libs/libcurl/src/vtls/wolfssl.h +++ b/libs/libcurl/src/vtls/wolfssl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/vtls/x509asn1.c b/libs/libcurl/src/vtls/x509asn1.c index dfb938621c..d5661b0976 100644 --- a/libs/libcurl/src/vtls/x509asn1.c +++ b/libs/libcurl/src/vtls/x509asn1.c @@ -18,6 +18,8 @@ * 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" @@ -956,7 +958,7 @@ static int do_pubkey(struct Curl_easy *data, int certnum, infof(data, " ECC Public Key (%lu bits)", len); if(data->set.ssl.certinfo) { char q[sizeof(len) * 8 / 3 + 1]; - msnprintf(q, sizeof(q), "%lu", len); + (void)msnprintf(q, sizeof(q), "%lu", len); if(Curl_ssl_push_certinfo(data, certnum, "ECC Public Key", q)) return 1; } diff --git a/libs/libcurl/src/vtls/x509asn1.h b/libs/libcurl/src/vtls/x509asn1.h index db7df0ef12..a18fa11530 100644 --- a/libs/libcurl/src/vtls/x509asn1.h +++ b/libs/libcurl/src/vtls/x509asn1.h @@ -21,6 +21,8 @@ * 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" diff --git a/libs/libcurl/src/warnless.c b/libs/libcurl/src/warnless.c index 0336a41d80..51187aa52e 100644 --- a/libs/libcurl/src/warnless.c +++ b/libs/libcurl/src/warnless.c @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/warnless.h b/libs/libcurl/src/warnless.h index 37ac5ba19f..4367099d92 100644 --- a/libs/libcurl/src/warnless.h +++ b/libs/libcurl/src/warnless.h @@ -20,6 +20,8 @@ * 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" diff --git a/libs/libcurl/src/wildcard.c b/libs/libcurl/src/wildcard.c index 105bcce4ed..a3e24b6784 100644 --- a/libs/libcurl/src/wildcard.c +++ b/libs/libcurl/src/wildcard.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, 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 @@ -18,6 +18,8 @@ * 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" diff --git a/libs/libcurl/src/wildcard.h b/libs/libcurl/src/wildcard.h index 081be9ed93..f9d2167bf2 100644 --- a/libs/libcurl/src/wildcard.h +++ b/libs/libcurl/src/wildcard.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010 - 2022, 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 @@ -20,6 +20,8 @@ * 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" |