summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* transfer: remove k->str NULL checkbagder/k-str-checkDaniel Stenberg2020-06-011-1/+1
| | | | | | | | "Null-checking k->str suggests that it may be null, but it has already been dereferenced on all paths leading to the check" - and it can't legally be NULL at this point. Remove check. Detected by Coverity CID 1463884
* select: always use Sleep in Curl_wait_ms on Win32Marc Hoersken2020-06-011-16/+4
| | | | | | | | | | | Since Win32 almost always will also have USE_WINSOCK, we can reduce complexity and always use Sleep there. Assisted-by: Jay Satiro Reviewed-by: Daniel Stenberg Follow up to #5343 Closes #5489
* conncache: download buffer needs +1 size for trailing zeroDaniel Stenberg2020-05-311-1/+1
| | | | | Follow-up to c4e6968127e Detected by OSS-Fuzz: https://oss-fuzz.com/testcase-detail/5727799779524608
* azure: use matrix strategy to avoid configuration redundancyMarc Hoersken2020-05-311-312/+109
| | | | | | | | | | | | | | | | | | | This also includes the following changes: - Use the same timeout for all jobs on Linux (60 minutes) and Windows (90 minutes) - Use CLI stable apt-get install -y instead of apt install which warns about that and run apt-get update first - Enable MQTT for Windows msys2 builds instead of legacy msys1 builds - Add ./configure --prefix parameter to the msys2 builds - The MSYSTEM environment variable is now preset inside the container images for the msys2 builds Note: on Azure Pipelines the matrix strategy is basically just a simple list of job copies and not really a matrix. Closes #5468
* build: disable more code/data when built without proxy supportDaniel Stenberg2020-05-3026-153/+419
| | | | | | Added build to travis to verify Closes #5466
* url: alloc the download buffer at transfer startDaniel Stenberg2020-05-3010-105/+66
| | | | | | | | | | | ... and free it as soon as the transfer is done. It removes the extra alloc when a new size is set with setopt() and reduces memory for unused easy handles. In addition: the closure_handle now doesn't use an allocated buffer at all but the smallest supported size as a stack based one. Closes #5472
* timeouts: change millisecond timeouts to timediff_t from time_tDaniel Stenberg2020-05-3015-54/+45
| | | | | | | For millisecond timers we like timediff_t better. Also, time_t can be unsigned so returning a negative value doesn't work then. Closes #5479
* select: add overflow checks for timeval conversionsMarc Hoersken2020-05-302-4/+72
| | | | | | | | | | | | Using time_t and suseconds_t if suseconds_t is available, long on Windows (maybe others in the future) and int elsewhere. Also handle case of ULONG_MAX being greater or equal to INFINITE. Assisted-by: Jay Satiro Reviewed-by: Daniel Stenberg Part of #5343
* select: use timediff_t instead of time_t and int for timeout_msMarc Hoersken2020-05-302-52/+39
| | | | | | | | | | | | | Make all functions in select.[ch] take timeout_ms as timediff_t which should always be large enough and signed on all platforms to take all possible timeout values and avoid type conversions. Reviewed-by: Jay Satiro Reviewed-by: Daniel Stenberg Replaces #5107 and partially #5262 Related to #5240 and #5286 Closes #5343
* unit1604.c: fix implicit conv from 'SANITIZEcode' to 'CURLcode'Marc Hoersken2020-05-301-3/+4
| | | | | | | | | | | | | GCC 10 warns about this with warning: implicit conversion from 'SANITIZEcode' to 'CURLcode' [-Wenum-conversion] Since 'expected_result' is not really of type 'CURLcode' and it is not exposed in any way, we can just use 'SANITIZEcode'. Reviewed-by: Daniel Stenberg Reviewed-by: Marcel Raad Closes #5476
* tests/libtest: fix undefined reference to 'curlx_win32_fopen'Marc Hoersken2020-05-301-19/+22
| | | | | | | | | | | | | Since curl_setup.h now makes use of curlx_win32_fopen for Win32 builds with USE_WIN32_LARGE_FILES or USE_WIN32_SMALL_FILES defined, we need to include the relevant files for tests using fopen, because the libtest sources are also including curl_setup.h Reviewed-by: Marcel Raad Reviewed-by: Daniel Stenberg Follow up to #3784 (ffdddb45d9) Closes #5475
* appveyor: add non-debug plain autotools-based buildMarc Hoersken2020-05-301-0/+5
| | | | | | | | | | This should enable us to catch linking issues with the testsuite early, like the one described/fixed in #5475. Reviewed-by: Daniel Stenberg Reviewed-by: Marcel Raad Closes #5477
* RELEASE-NOTES: syncedDaniel Stenberg2020-05-291-7/+41
|
* Revert "buildconf: use find -execdir"Daniel Stenberg2020-05-291-1/+1
| | | | | | | | | | | This partially reverts commit c712009838f44211958854de431315586995bc61. Keep the ares_ files removed but bring back the older way to run find, to make it work with busybox's find, as apparently that's being used. Reported-by: Max Peal Fixes #5483 Closes #5484
* server/sws: fix asan warning on use of uninitialized variableDaniel Stenberg2020-05-291-1/+5
|
* libssh2: improved error output for wrong quote syntaxDaniel Stenberg2020-05-291-4/+4
| | | | | | Reported-by: Werner Stolz Closes #5474
* mk-lib1521: generate code for testing BLOB options as wellDaniel Stenberg2020-05-291-0/+5
| | | | | | Follow-up to cac5374298b3 Closes #5478
* configure: repair the check if argv can be written toDaniel Stenberg2020-05-281-5/+7
| | | | | | | | | | | | | | Due to bad escaping of the test code, the test wouldn't build and thus result in a negative test result, which would lead to the unconditional assumption that overwriting the arguments doesn't work and thus curl would never hide credentials given in the command line, even when it would otherwise be possible. Regression from commit 2d4c2152c (7.60.0) Reported-by: huzunhao on github Fixes #5470 Closes #5471
* CMake: rebuild Makefile.inc.cmake when Makefile.inc changesPeter Wu2020-05-281-1/+1
| | | | | | | Otherwise the build might fail due to missing source files, as demonstrated by the recent keylog.c addition on an existing build dir. Closes #5469
* urldata: fix comments: Curl_done() is called multi_done() nowDaniel Stenberg2020-05-282-3/+3
| | | | ... since 575e885db
* ngtcp2: use common key log routine for better thread-safetyPeter Wu2020-05-271-42/+12
| | | | | | | | | Tested with ngtcp2 built against the OpenSSL library. Additionally tested with MultiSSL (NSS for TLS and ngtcp2+OpenSSL for QUIC). The TLS backend (independent of QUIC) may or may not already have opened the keylog file before. Therefore Curl_tls_keylog_open is always called to ensure the file is open.
* wolfssl: add SSLKEYLOGFILE supportPeter Wu2020-05-271-0/+144
| | | | | | | | | | | | Tested following the same curl and tshark commands as in commit "vtls: Extract and simplify key log file handling from OpenSSL" using WolfSSL v4.4.0-stable-128-g5179503e8 from git master built with `./configure --enable-all --enable-debug CFLAGS=-DHAVE_SECRET_CALLBACK`. Full support for this feature requires certain wolfSSL build options, see "Availability note" in lib/vtls/wolfssl.c for details. Closes #5327
* vtls: Extract and simplify key log file handling from OpenSSLPeter Wu2020-05-274-125/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a set of routines for TLS key log file handling to enable reuse with other TLS backends. Simplify the OpenSSL backend as follows: - Drop the ENABLE_SSLKEYLOGFILE macro as it is unconditionally enabled. - Do not perform dynamic memory allocation when preparing a log entry. Unless the TLS specifications change we can suffice with a reasonable fixed-size buffer. - Simplify state tracking when SSL_CTX_set_keylog_callback is unavailable. My original sslkeylog.c code included this tracking in order to handle multiple calls to SSL_connect and detect new keys after renegotiation (via SSL_read/SSL_write). For curl however we can be sure that a single master secret eventually becomes available after SSL_connect, so a simple flag is sufficient. An alternative to the flag is examining SSL_state(), but this seems more complex and is not pursued. Capturing keys after server renegotiation was already unsupported in curl and remains unsupported. Tested with curl built against OpenSSL 0.9.8zh, 1.0.2u, and 1.1.1f (`SSLKEYLOGFILE=keys.txt curl -vkso /dev/null https://localhost:4433`) against an OpenSSL 1.1.1f server configured with: # Force non-TLSv1.3, use TLSv1.0 since 0.9.8 fails with 1.1 or 1.2 openssl s_server -www -tls1 # Likewise, but fail the server handshake. openssl s_server -www -tls1 -Verify 2 # TLS 1.3 test. No need to test the failing server handshake. openssl s_server -www -tls1_3 Verify that all secrets (1 for TLS 1.0, 4 for TLS 1.3) are correctly written using Wireshark. For the first and third case, expect four matches per connection (decrypted Server Finished, Client Finished, HTTP Request, HTTP Response). For the second case where the handshake fails, expect a decrypted Server Finished only. tshark -i lo -pf tcp -otls.keylog_file:keys.txt -Tfields \ -eframe.number -eframe.time -etcp.stream -e_ws.col.Info \ -dtls.port==4433,http -ohttp.desegment_body:FALSE \ -Y 'tls.handshake.verify_data or http' A single connection can easily be identified via the `tcp.stream` field.
* FILEFORMAT: add more features that tests can depend onDaniel Stenberg2020-05-271-0/+10
|
* transfer: close connection after excess data has been readMichael Kaufmann2020-05-271-0/+1
| | | | | | | | For HTTP 1.x, it's a protocol error when the server sends more bytes than announced. If this happens, don't reuse the connection, because the start position of the next response is undefined. Closes #5440
* Revert "ssh: ignore timeouts during disconnect"Estanislau Augé-Pujadas2020-05-271-15/+12
| | | | | | | | This reverts commit f31760e63b4e9ef1eb25f8f211390f8239388515. Shipped in curl 7.54.1. Bug: https://curl.haxx.se/mail/lib-2020-05/0068.html Closes #5465
* urldata: connect related booleans live in struct ConnectBitsDaniel Stenberg2020-05-278-36/+29
| | | | | | And remove a few unused booleans! Closes #5461
* hostip: on macOS avoid DoH when given a numerical IP addressDaniel Stenberg2020-05-263-6/+18
| | | | | | | | | When USE_RESOLVE_ON_IPS is set (defined on macOS), it means that numerical IP addresses still need to get "resolved" - but not with DoH. Reported-by: Viktor Szakats Fixes #5454 Closes #5459
* ngtcp2: cleanup memory when failing to connectDaniel Stenberg2020-05-261-6/+14
| | | | | | Reported-by: Peter Wu Fixes #5447 (the ngtcp2 side of it) Closes #5451
* quiche: clean up memory properly when failing to connectDaniel Stenberg2020-05-261-8/+17
| | | | | | Addresses the quiche side of #5447 Reported-by: Peter Wu Closes #5450
* cleanup: use a single space after equals sign in assignmentsDaniel Stenberg2020-05-267-12/+12
|
* url: accept "any length" credentials for proxy authDaniel Stenberg2020-05-255-30/+70
| | | | | | | | | | | They're only limited to the maximum string input restrictions, not to 256 bytes. Added test 1178 to verify Reported-by: Will Roberts Fixes #5448 Closes #5449
* test1167: fixes in badsymbols.plMaksim Stsepanenka2020-05-251-3/+3
| | | | Closes #5442
* altsvc: fix parser for lines ending with CRLFDaniel Stenberg2020-05-252-12/+17
| | | | | | | | | | | | | Fixed the alt-svc parser to treat a newline as end of line. The unit tests in test 1654 were done without CRLF and thus didn't quite match the real world. Now they use CRLF as well. Reported-by: Peter Wu Assisted-by: Peter Wu Assisted-by: Jay Satiro Fixes #5445 Closes #5446
* all: fix codespell errorsViktor Szakats2020-05-2522-31/+31
| | | | | | Reviewed-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes https://github.com/curl/curl/pull/5452
* ngtcp2: fix build with current ngtcp2 master implementing draft 28Peter Wu2020-05-252-88/+24
| | | | | | | | Based on client.cc changes from ngtcp2. Tested with current git master, ngtcp2 commit c77d5731ce92, nghttp3 commit 65ff479d4380. Fixes #5444 Closes #5443
* RELEASE-NOTES: syncedDaniel Stenberg2020-05-251-1/+1
| | | | moved the new setopts up to a "change"
* RELEASE-NOTES: syncedDaniel Stenberg2020-05-251-9/+29
|
* copyright: updated year ranges out of syncDaniel Stenberg2020-05-249-9/+12
| | | | ... and whitelisted a few more files in the the copyright.pl script.
* setopt: add CURLOPT_PROXY_ISSUERCERT(_BLOB) for coherencyGilles Vollant2020-05-238-0/+188
| | | | Closes #5431
* curl: remove -J "informational" written on stdoutDaniel Stenberg2020-05-233-8/+4
| | | | | | | | | | | curl would previously show "curl: Saved to filename 'name from header'" if -J was used and a name was picked from the Content-Disposition header. That output could interfer with other stdout output, such as -w. This commit removes that output line. Bug: https://curl.haxx.se/mail/archive-2020-05/0044.html Reported-by: Коваленко Анатолий Викторович Closes #5435
* travis: simplify quiche build instructions wrt boringsslPeter Wu2020-05-223-22/+10
| | | | | | | quiche builds boringssl as static library, reuse that instead of building another shared library. Closes #5438
* configure: fix pthread check with static boringsslPeter Wu2020-05-221-2/+13
| | | | | | | A shared boringssl/OpenSSL library requires -lcrypto only for linking. A static build additionally requires `-ldl -lpthread`. In the latter case `-lpthread` is added to LIBS which prevented `-pthread` from being added to CFLAGS. Clear LIBS to fix linking failures for libtest tests.
* Revert "sendf: make failf() use the mvsnprintf() return code"Daniel Stenberg2020-05-221-1/+2
| | | | | | | | | | This reverts commit 74623551f306990e70c7c5515b88972005604a74. Instead mark the function call with (void). Getting the return code and using it instead triggered Coverity warning CID 1463596 because snprintf() can return a negative value... Closes #5441
* typecheck-gcc.h: CURLINFO_PRIVATE does not need a 'char *'Daniel Stenberg2020-05-211-2/+3
| | | | | | Reported-by: Billyzou0741326 on github Fixes #5432 Closes #5436
* tests/server/util.h: add extern to silence compiler warningDaniel Stenberg2020-05-201-0/+2
| | | | Follow-up from a3b0699d5c1
* typecheck-gcc.h: fix the OFF_T checkDaniel Stenberg2020-05-201-2/+2
| | | | | | | | The option number also needs to be less than CURLOPTTYPE_BLOB. Follow-up to cac5374298 Reported-by: Jeroen Ooms Bug: https://github.com/curl/curl/pull/5365#issuecomment-631084114
* TODO: --dry-runDaniel Stenberg2020-05-191-0/+8
| | | | Closes #5426
* TODO: Ratelimit or wait between serial requestsDaniel Stenberg2020-05-191-0/+11
| | | | Closes #5406
* tool_paramhlp: fixup C89 mistakeDaniel Stenberg2020-05-191-2/+1
| | | | Follow-up to c5f0a9db22.
View Lorry Controller Status