]> granicus.if.org Git - curl/log
curl
7 years agosymbols-in-versions: fix CURLSSLSET_NO_BACKENDS entry
Jay Satiro [Sat, 23 Sep 2017 07:19:47 +0000 (03:19 -0400)]
symbols-in-versions: fix CURLSSLSET_NO_BACKENDS entry

- Use spaces instead of tabs as the delimiter.

Follow up to 7c52b12 which added the entry. The entry had used tabs but
the symbol-scan parser doesn't recognize tabs and would fail the symbol.

7 years agometalink: fix NSS issue in MultiSSL builds
Viktor Szakats [Tue, 12 Sep 2017 18:14:00 +0000 (18:14 +0000)]
metalink: fix NSS issue in MultiSSL builds

In MultiSSL mode (i.e. when more than one SSL backend is compiled
in), we cannot use the compile time flag `USE_NSS` as indicator that
the NSS backend is in use. As far as Metalink is concerned, the SSL
backend is only used for MD5, SHA-1 and SHA-256 calculations,
therefore one of the available SSL backends is selected at compile
time, in a strict order of preference.

Let's introduce a new `HAVE_NSS_CONTEXT` constant that can be used
to determine whether the SSL backend used for Metalink is the NSS
backend, and use that to guard the code that wants to de-initialize
the NSS-specific data structure.

Ref: https://github.com/curl/curl/pull/1848

7 years agontlm: use strict order for SSL backend #if branches
Viktor Szakats [Wed, 30 Aug 2017 21:10:38 +0000 (21:10 +0000)]
ntlm: use strict order for SSL backend #if branches

With the recently introduced MultiSSL support multiple SSL backends
can be compiled into cURL That means that now the order of the SSL

One option would be to use the same SSL backend as was configured
via `curl_global_sslset()`, however, NTLMv2 support would appear
to be available only with some SSL backends. For example, when
eb88d778e (ntlm: Use Windows Crypt API, 2014-12-02) introduced
support for NTLMv1 using Windows' Crypt API, it specifically did
*not* introduce NTLMv2 support using Crypt API at the same time.

So let's select one specific SSL backend for NTLM support when
compiled with multiple SSL backends, using a priority order such
that we support NTLMv2 even if only one compiled-in SSL backend can
be used for that.

Ref: https://github.com/curl/curl/pull/1848

7 years agosymbols-in-versions: add CURLSSLSET_NO_BACKENDS
Daniel Stenberg [Fri, 22 Sep 2017 14:22:57 +0000 (16:22 +0200)]
symbols-in-versions: add CURLSSLSET_NO_BACKENDS

...fixup from b8e0fe19ec

7 years agoimap: quote atoms properly when escaping characters
Daniel Stenberg [Thu, 21 Sep 2017 07:17:06 +0000 (09:17 +0200)]
imap: quote atoms properly when escaping characters

Updates test 800 to verify

Fixes #1902
Closes #1903

7 years agotests: make the imap server not verify user+password
Daniel Stenberg [Thu, 21 Sep 2017 06:21:43 +0000 (08:21 +0200)]
tests: make the imap server not verify user+password

... as the test cases themselves do that and it makes it easier to add
crazy test cases.

Test 800 updated to use user name + password that need quoting.

Test 856 updated to trigger an auth fail differently.

Ref: #1902

7 years agovtls: provide curl_global_sslset() even in non-SSL builds
Daniel Stenberg [Thu, 21 Sep 2017 21:30:48 +0000 (23:30 +0200)]
vtls: provide curl_global_sslset() even in non-SSL builds

... it just returns error:

Bug: https://github.com/curl/curl/commit/1328f69d53f2f2e937696ea954c480412b018451#commitcomment-24470367
Reported-by: Marcel Raad
Closes #1906

7 years agoform/mime: field names are not allowed to contain zero-valued bytes.
Patrick Monnerat [Fri, 22 Sep 2017 00:08:29 +0000 (01:08 +0100)]
form/mime: field names are not allowed to contain zero-valued bytes.

Also suppress length argument of curl_mime_name() (names are always
zero-terminated).

7 years agoopenssl: only verify RSA private key if supported
Dirk Feytons [Thu, 21 Sep 2017 07:57:32 +0000 (09:57 +0200)]
openssl: only verify RSA private key if supported

In some cases the RSA key does not support verifying it because it's
located on a smart card, an engine wants to hide it, ...
Check the flags on the key before trying to verify it.
OpenSSL does the same thing internally; see ssl/ssl_rsa.c

Closes #1904

7 years agoexamples/post-callback: use long for CURLOPT_POSTFIELDSIZE
Marcel Raad [Thu, 21 Sep 2017 18:07:24 +0000 (20:07 +0200)]
examples/post-callback: use long for CURLOPT_POSTFIELDSIZE

Otherwise, typecheck-gcc.h warns on MinGW-w64.

7 years agomime: rephrase the multipart output state machine (#1898) ...
Patrick Monnerat [Wed, 20 Sep 2017 13:06:47 +0000 (14:06 +0100)]
mime: rephrase the multipart output state machine (#1898) ...

... in hope coverity will like it much.

7 years agomime: fix an explicit null dereference (#1899)
Patrick Monnerat [Wed, 20 Sep 2017 11:01:11 +0000 (12:01 +0100)]
mime: fix an explicit null dereference (#1899)

7 years agocurl: check fseek() return code and bail on error
Daniel Stenberg [Wed, 20 Sep 2017 10:03:44 +0000 (12:03 +0200)]
curl: check fseek() return code and bail on error

Detected by coverity. CID 1418137.

7 years agosmtp: fix memory leak in OOM
Daniel Stenberg [Wed, 20 Sep 2017 09:33:46 +0000 (11:33 +0200)]
smtp: fix memory leak in OOM

Regression since ce0881edee

Coverity CID 1418139 and CID 1418136 found it, but it was also seen in
torture testing.

7 years agoRELEASE-NOTES: synced with 5fe85587c
Daniel Stenberg [Wed, 20 Sep 2017 06:31:04 +0000 (08:31 +0200)]
RELEASE-NOTES: synced with 5fe85587c

7 years agocookies: use lock when using CURLINFO_COOKIELIST
Pavel P [Mon, 18 Sep 2017 22:50:16 +0000 (15:50 -0700)]
cookies: use lock when using CURLINFO_COOKIELIST

Closes #1896

7 years agoossfuzz: changes before merging the generated corpora
Max Dymond [Mon, 11 Sep 2017 19:51:58 +0000 (20:51 +0100)]
ossfuzz: changes before merging the generated corpora

Before merging in the oss-fuzz corpora from Google, there are some changes
to the fuzzer.
- Add a read corpus script, to display corpus files nicely.
- Change the behaviour of the fuzzer so that TLV parse failures all now
  go down the same execution paths, which should reduce the size of the
  corpora.
- Make unknown TLVs a failure to parse, which should decrease the size
  of the corpora as well.

Closes #1881

7 years agomime:escape_string minor clarification change
Daniel Stenberg [Sun, 17 Sep 2017 21:31:49 +0000 (23:31 +0200)]
mime:escape_string minor clarification change

... as it also removes a warning with old gcc versions.

Bug: https://curl.haxx.se/mail/lib-2017-09/0049.html
Reported-by: Ben Greear
7 years agoossfuzz: don't write out to stdout
Max Dymond [Mon, 11 Sep 2017 19:00:27 +0000 (20:00 +0100)]
ossfuzz: don't write out to stdout

Don't make the fuzzer write out to stdout - instead write some of the
contents to a memory block so we exercise the data output code but
quietly.

Closes #1885

7 years agocookies: reject oversized cookies
Daniel Stenberg [Sun, 17 Sep 2017 22:55:07 +0000 (00:55 +0200)]
cookies: reject oversized cookies

... instead of truncating them.

There's no fixed limit for acceptable cookie names in RFC 6265, but the
entire cookie is said to be less than 4096 bytes (section 6.1). This is
also what browsers seem to implement.

We now allow max 5000 bytes cookie header. Max 4095 bytes length per
cookie name and value. Name + value together may not exceed 4096 bytes.

Added test 1151 to verify

Bug: https://curl.haxx.se/mail/lib-2017-09/0062.html
Reported-by: Kevin Smith
Closes #1894

7 years agotravis: on mac, don't install openssl or libidn
Daniel Stenberg [Mon, 18 Sep 2017 08:49:38 +0000 (10:49 +0200)]
travis: on mac, don't install openssl or libidn

- openssl is already installed and causes warnings when trying to
  install again

- libidn isn't used these days, and homebrew doesn't seem to have a
  libidn2 package to replace with easily

Closes #1895

7 years agocurl: make str2udouble not return values on error
Daniel Stenberg [Fri, 15 Sep 2017 14:38:48 +0000 (16:38 +0200)]
curl: make str2udouble not return values on error

... previously it would store a return value even when it returned
error, which could make the value get used anyway!

Reported-by: Brian Carpenter
Closes #1893

7 years agosocks: fix incorrect port number in SOCKS4 error message
Jay Satiro [Mon, 18 Sep 2017 07:07:57 +0000 (03:07 -0400)]
socks: fix incorrect port number in SOCKS4 error message

Prior to this change it appears the SOCKS5 port parsing was erroneously
used for the SOCKS4 error message, and as a result an incorrect port
would be shown in the error message.

Bug: https://github.com/curl/curl/issues/1892
Reported-by: Jackarain@users.noreply.github.com
7 years agoschannel: Support partial send for when data is too large
Marc Aldorasi [Fri, 15 Sep 2017 17:00:05 +0000 (13:00 -0400)]
schannel: Support partial send for when data is too large

Schannel can only encrypt a certain amount of data at once.  Instead of
failing when too much data is to be sent at once, send as much data as
we can and let the caller send the remaining data by calling send again.

Bug: https://curl.haxx.se/mail/lib-2014-07/0033.html

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

7 years agoopenssl: add missing includes
David Benjamin [Fri, 15 Sep 2017 22:36:40 +0000 (18:36 -0400)]
openssl: add missing includes

lib/vtls/openssl.c uses OpenSSL APIs from BUF_MEM and BIO APIs. Include
their headers directly rather than relying on other OpenSSL headers
including things.

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

7 years agoconversions: fix several compiler warnings
Daniel Stenberg [Sun, 10 Sep 2017 22:31:12 +0000 (00:31 +0200)]
conversions: fix several compiler warnings

7 years agoserver/getpart: provide dummy function to build conversion enabled
Daniel Stenberg [Fri, 8 Sep 2017 07:33:22 +0000 (09:33 +0200)]
server/getpart: provide dummy function to build conversion enabled

7 years agonon-ascii: use iconv() with 'char **' argument
Daniel Stenberg [Fri, 8 Sep 2017 07:22:01 +0000 (09:22 +0200)]
non-ascii: use iconv() with 'char **' argument

Bug: https://curl.haxx.se/mail/lib-2017-09/0031.html

7 years agoescape.c: error: pointer targets differ in signedness
Daniel Stenberg [Fri, 8 Sep 2017 06:58:12 +0000 (08:58 +0200)]
escape.c: error: pointer targets differ in signedness

7 years agodocs: clarify the CURLOPT_INTERLEAVE* options behavior
Daniel Stenberg [Fri, 15 Sep 2017 13:47:56 +0000 (15:47 +0200)]
docs: clarify the CURLOPT_INTERLEAVE* options behavior

7 years agortsp: Segfault in rtsp.c when using WRITEDATA
Max Dymond [Tue, 12 Sep 2017 18:45:19 +0000 (19:45 +0100)]
rtsp: Segfault in rtsp.c when using WRITEDATA

If the INTERLEAVEFUNCTION is defined, then use that plus the
INTERLEAVEDATA information when writing RTP. Otherwise, use
WRITEFUNCTION and WRITEDATA.

Fixes #1880
Closes #1884

7 years agotests: enable gssapi in travis-ci linux build
Isaac Boukris [Wed, 19 Jul 2017 17:41:26 +0000 (20:41 +0300)]
tests: enable gssapi in travis-ci linux build

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

7 years agotests: add initial gssapi test using stub implementation
Isaac Boukris [Tue, 18 Jul 2017 18:46:21 +0000 (21:46 +0300)]
tests: add initial gssapi test using stub implementation

The stub implementation is pre-loaded using LD_PRELOAD
and emulates common gssapi uses (only builds if curl is
initially built with gssapi support).

The initial tests are currently disabled for debug builds
as LD_PRELOAD is not used then.

Ref: https://github.com/curl/curl/pull/1687

7 years agotest1150: verify same host fetch using different ports over proxy
Daniel Stenberg [Thu, 14 Sep 2017 20:50:32 +0000 (22:50 +0200)]
test1150: verify same host fetch using different ports over proxy

Closes #1889

7 years agoURL: on connection re-use, still pick the new remote port
Daniel Stenberg [Thu, 14 Sep 2017 14:49:40 +0000 (16:49 +0200)]
URL: on connection re-use, still pick the new remote port

... as when a proxy connection is being re-used, it can still get a
different remote port.

Fixes #1887
Reported-by: Oli Kingshott
7 years agoRELEASE-NOTES: synced with 87501e57f
Daniel Stenberg [Tue, 12 Sep 2017 12:20:04 +0000 (14:20 +0200)]
RELEASE-NOTES: synced with 87501e57f

7 years agocode style: remove wrong uses of multiple spaces
Daniel Stenberg [Tue, 12 Sep 2017 07:29:01 +0000 (09:29 +0200)]
code style: remove wrong uses of multiple spaces

Closes #1878

7 years agochecksrc: detect and warn for multiple spaces
Daniel Stenberg [Tue, 12 Sep 2017 07:28:37 +0000 (09:28 +0200)]
checksrc: detect and warn for multiple spaces

7 years agocode style: use space after semicolon
Daniel Stenberg [Mon, 11 Sep 2017 07:27:06 +0000 (09:27 +0200)]
code style: use space after semicolon

7 years agochecksrc: verify space after semicolons
Daniel Stenberg [Mon, 11 Sep 2017 07:25:31 +0000 (09:25 +0200)]
checksrc: verify space after semicolons

7 years agocode style: use spaces around pluses
Daniel Stenberg [Sat, 9 Sep 2017 21:55:08 +0000 (23:55 +0200)]
code style: use spaces around pluses

7 years agochecksrc: detect and warn for lack of spaces next to plus signs
Daniel Stenberg [Sat, 9 Sep 2017 21:54:47 +0000 (23:54 +0200)]
checksrc: detect and warn for lack of spaces next to plus signs

7 years agocode style: use spaces around equals signs
Daniel Stenberg [Sat, 9 Sep 2017 21:09:06 +0000 (23:09 +0200)]
code style: use spaces around equals signs

7 years agochecksrc: verify spaces around equals signs
Daniel Stenberg [Sat, 9 Sep 2017 09:57:17 +0000 (11:57 +0200)]
checksrc: verify spaces around equals signs

... as the code style mandates.

7 years agoCurl_checkheaders: make it available for IMAP and SMTP too
Daniel Stenberg [Fri, 8 Sep 2017 13:13:42 +0000 (15:13 +0200)]
Curl_checkheaders: make it available for IMAP and SMTP too

... not only HTTP uses this now.

Closes #1875

7 years agotravis: add build without HTTP/SMTP/IMAP
Daniel Stenberg [Fri, 8 Sep 2017 13:13:22 +0000 (15:13 +0200)]
travis: add build without HTTP/SMTP/IMAP

7 years agombedtls: enable CA path processing
Jay Satiro [Sun, 10 Sep 2017 07:22:05 +0000 (03:22 -0400)]
mbedtls: enable CA path processing

CA path processing was implemented when mbedtls.c was added to libcurl
in fe7590f, but it was never enabled.

Bug: https://github.com/curl/curl/issues/1877
Reported-by: SBKarr@users.noreply.github.com
7 years agortsp: do not call fwrite() with NULL pointer FILE *
Daniel Stenberg [Fri, 8 Sep 2017 08:20:36 +0000 (10:20 +0200)]
rtsp: do not call fwrite() with NULL pointer FILE *

If the default write callback is used and no destination has been set, a
NULL pointer would be passed to fwrite()'s 4th argument.

OSS-fuzz bug https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3327
(not publicly open yet)

Detected by OSS-fuzz
Closes #1874

7 years agoconfigure: use -Wno-varargs on clang 3.9[.X] debug builds
Daniel Stenberg [Fri, 8 Sep 2017 12:48:45 +0000 (14:48 +0200)]
configure: use -Wno-varargs on clang 3.9[.X] debug builds

... to avoid a clang bug

7 years agoossfuzz: add some more handled CURL options
Max Dymond [Sat, 2 Sep 2017 21:40:01 +0000 (22:40 +0100)]
ossfuzz: add some more handled CURL options

Add support for HEADER, COOKIE, RANGE, CUSTOMREQUEST, MAIL_RECIPIENT,
MAIL_FROM and uploading data.

7 years agoconfigure: check for C++ compiler after C, to make it non-fatal
Daniel Stenberg [Thu, 7 Sep 2017 14:25:38 +0000 (16:25 +0200)]
configure: check for C++ compiler after C, to make it non-fatal

The tests for object file/executable file extensions are presumably only
done for the first of these macros in the configure file.

Bug: https://github.com/curl/curl/pull/1851#issuecomment-327597515
Reported-by: Marcel Raad
Closes #1873

7 years agoform API: add new test 650.
Patrick Monnerat [Thu, 7 Sep 2017 18:11:02 +0000 (19:11 +0100)]
form API: add new test 650.

Now that the form API is deprecated and not used anymore in curl tool,
a lot of its features left untested. Test 650 attempts to check all these
features not tested elsewhere.

7 years agoconfigure: fix curl_off_t check's include order
Jay Satiro [Wed, 6 Sep 2017 22:04:16 +0000 (18:04 -0400)]
configure: fix curl_off_t check's include order

- Prepend srcdir include path instead of append.

Prior to this change it was possible that during the check for the size
of curl_off_t the include path of a user's already installed curl could
come before the include path of the to-be-built curl, resulting in the
system.h of the former being incorrectly included for that check.

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

7 years agoKNOWN_BUGS: Remove CMake symbol hiding issue
Jakub Zakrzewski [Sat, 26 Aug 2017 15:34:07 +0000 (17:34 +0200)]
KNOWN_BUGS: Remove CMake symbol hiding issue

It has already been fixed in 6140dfc

7 years agohttp-proxy: when not doing CONNECT, that phase is done immediately
Daniel Stenberg [Mon, 4 Sep 2017 21:43:05 +0000 (23:43 +0200)]
http-proxy: when not doing CONNECT, that phase is done immediately

`conn->connect_state` is NULL when doing a regular non-CONNECT request
over the proxy and should therefor be considered complete at once.

Fixes #1853
Closes #1862
Reported-by: Lawrence Wagerfield
7 years agoOpenSSL: fix yet another mistake while encapsulating SSL backend data
Johannes Schindelin [Wed, 6 Sep 2017 22:55:38 +0000 (00:55 +0200)]
OpenSSL: fix yet another mistake while encapsulating SSL backend data

Another mistake in my manual fixups of the largely mechanical
search-and-replace ("connssl->" -> "BACKEND->"), just like the previous
commit concerning HTTPS proxies (and hence not caught during my
earlier testing).

Fixes #1855
Closes #1871

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
7 years agoOpenSSL: fix erroneous SSL backend encapsulation
Johannes Schindelin [Wed, 6 Sep 2017 22:04:06 +0000 (00:04 +0200)]
OpenSSL: fix erroneous SSL backend encapsulation

In d65e6cc4f (vtls: prepare the SSL backends for encapsulated private
data, 2017-06-21), this developer prepared for a separation of the
private data of the SSL backends from the general connection data.

This conversion was partially automated (search-and-replace) and
partially manual (e.g. proxy_ssl's backend data).

Sadly, there was a crucial error in the manual part, where the wrong
handle was used: rather than connecting ssl[sockindex]' BIO to the
proxy_ssl[sockindex]', we reconnected proxy_ssl[sockindex]. The reason
was an incorrect location to paste "BACKEND->"... d'oh.

Reported by Jay Satiro in https://github.com/curl/curl/issues/1855.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
7 years agovtls: fix memory corruption
Jay Satiro [Wed, 6 Sep 2017 21:39:21 +0000 (23:39 +0200)]
vtls: fix memory corruption

Ever since 70f1db321 (vtls: encapsulate SSL backend-specific data,
2017-07-28), the code handling HTTPS proxies was broken because the
pointer to the SSL backend data was not swapped between
conn->ssl[sockindex] and conn->proxy_ssl[sockindex] as intended, but
instead set to NULL (causing segmentation faults).

[jes: provided the commit message, tested and verified the patch]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
7 years agovtls: switch to CURL_SHA256_DIGEST_LENGTH define
Daniel Stenberg [Wed, 6 Sep 2017 07:32:02 +0000 (09:32 +0200)]
vtls: switch to CURL_SHA256_DIGEST_LENGTH define

... instead of the prefix-less version since WolfSSL 3.12 now uses an
enum with that name that causes build failures for us.

Fixes #1865
Closes #1867
Reported-by: Gisle Vanem
7 years agotravis: add c-ares enabled builds linux + osx
Daniel Stenberg [Wed, 6 Sep 2017 08:05:05 +0000 (10:05 +0200)]
travis: add c-ares enabled builds linux + osx

Closes #1868

7 years agoHISTORY: added some recent items
Daniel Stenberg [Thu, 7 Sep 2017 07:51:25 +0000 (09:51 +0200)]
HISTORY: added some recent items

7 years agoSSL: fix unused parameter warnings
Jay Satiro [Wed, 6 Sep 2017 19:11:55 +0000 (15:11 -0400)]
SSL: fix unused parameter warnings

7 years agomime: drop internal FILE * support.
Patrick Monnerat [Wed, 6 Sep 2017 12:42:03 +0000 (13:42 +0100)]
mime: drop internal FILE * support.

- The part kind MIMEKIND_FILE and associated code are suppressed.
- Seek data origin offset not used anymore: suppressed.
- MIMEKIND_NAMEDFILE renamed MIMEKIND_FILE; associated fields/functions
  renamed accordingly.
- Curl_getformdata() processes stdin via a callback.

7 years agoconfigure: remove --enable-soname-bump and SONAME_BUMP
Daniel Stenberg [Mon, 4 Sep 2017 10:24:41 +0000 (12:24 +0200)]
configure: remove --enable-soname-bump and SONAME_BUMP

Back in 2008, (and commit 3f3d6ebe665f3) we changed the logic in how we
determine the native type for `curl_off_t`. To really make sure we
didn't break ABI without bumping SONAME, we introduced logic that
attempted to detect that it would use a different size and thus not be
compatible. We also provided a manual switch that allowed users to tell
configure to bump SONAME by force.

Today, we know of no one who ever got a SONAME bump auto-detected and we
don't know of anyone who's using the manual bump feature. The auto-
detection is also no longer working since we introduced defining
curl_off_t in system.h (7.55.0).

Finally, this bumping logic is not present in the cmake build.

Closes #1861

7 years agovtls: select ssl backend case-insensitive (follow-up)
Gisle Vanem [Wed, 6 Sep 2017 06:22:49 +0000 (02:22 -0400)]
vtls: select ssl backend case-insensitive (follow-up)

- Do a case-insensitive comparison of CURL_SSL_BACKEND env as well.

- Change Curl_strcasecompare calls to strcasecompare
  (maps to the former but shorter).

Follow-up to c290b8f.

Bug: https://github.com/curl/curl/commit/c290b8f#commitcomment-24094313

Co-authored-by: Jay Satiro
7 years agoopenssl: Integrate Peter Wu's SSLKEYLOGFILE implementation
Jay Satiro [Tue, 5 Sep 2017 19:27:22 +0000 (15:27 -0400)]
openssl: Integrate Peter Wu's SSLKEYLOGFILE implementation

This is an adaptation of 2 of Peter Wu's SSLKEYLOGFILE implementations.

The first one, written for old OpenSSL versions:
https://git.lekensteyn.nl/peter/wireshark-notes/tree/src/sslkeylog.c

The second one, written for BoringSSL and new OpenSSL versions:
https://github.com/curl/curl/pull/1346

Note the first one is GPL licensed but the author gave permission to
waive that license for libcurl.

As of right now this feature is disabled by default, and does not have
a configure option to enable it. To enable this feature define
ENABLE_SSLKEYLOGFILE when building libcurl and set environment
variable SSLKEYLOGFILE to a pathname that will receive the keys.

And in Wireshark change your preferences to point to that key file:
Edit > Preferences > Protocols > SSL > Master-Secret

Co-authored-by: Peter Wu
Ref: https://github.com/curl/curl/pull/1030
Ref: https://github.com/curl/curl/pull/1346

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

7 years agomime: fix a trivial warning.
Patrick Monnerat [Tue, 5 Sep 2017 17:38:31 +0000 (18:38 +0100)]
mime: fix a trivial warning.

7 years agomime: replace 'struct Curl_mimepart' by 'curl_mimepart' in encoder code.
Patrick Monnerat [Tue, 5 Sep 2017 17:20:06 +0000 (18:20 +0100)]
mime: replace 'struct Curl_mimepart' by 'curl_mimepart' in encoder code.

mime_state is now a typedef.

7 years agomime: implement encoders.
Patrick Monnerat [Tue, 5 Sep 2017 16:11:59 +0000 (17:11 +0100)]
mime: implement encoders.

curl_mime_encoder() is operational and documented.
curl tool -F option is extended with ";encoder=".
curl tool --libcurl option generates calls to curl_mime_encoder().
New encoder tests 648 & 649.
Test 1404 extended with an encoder specification.

7 years agoruntests.pl: support attribute "nonewline" in part verify/upload.
Patrick Monnerat [Tue, 5 Sep 2017 16:10:05 +0000 (17:10 +0100)]
runtests.pl: support attribute "nonewline" in part verify/upload.

7 years agofixup data/test1135
Daniel Stenberg [Tue, 5 Sep 2017 12:47:59 +0000 (14:47 +0200)]
fixup data/test1135

7 years agomime: unified to use the typedef'd mime structs everywhere
Daniel Stenberg [Tue, 5 Sep 2017 09:45:21 +0000 (11:45 +0200)]
mime: unified to use the typedef'd mime structs everywhere

... and slightly edited to follow our code style better.

7 years agocurl.h: use lower case curl_mime* as for all public symbols
Daniel Stenberg [Tue, 5 Sep 2017 09:44:28 +0000 (11:44 +0200)]
curl.h: use lower case curl_mime* as for all public symbols

7 years agodocs/curl_mime_*.3: use correct variable types in examples
Daniel Stenberg [Tue, 5 Sep 2017 09:41:03 +0000 (11:41 +0200)]
docs/curl_mime_*.3: use correct variable types in examples

7 years agoopenssl: use OpenSSL's default ciphers by default
Kamil Dudka [Wed, 30 Aug 2017 12:12:10 +0000 (14:12 +0200)]
openssl: use OpenSSL's default ciphers by default

Up2date versions of OpenSSL maintain the default reasonably secure
without breaking compatibility, so it is better not to override the
default by curl.  Suggested at https://bugzilla.redhat.com/1483972

Closes #1846

7 years agoexamples/mime: minor example code fixes
Viktor Szakats [Tue, 5 Sep 2017 10:05:27 +0000 (10:05 +0000)]
examples/mime: minor example code fixes

7 years agodocs/curl_mime_*.3: added examples
Daniel Stenberg [Tue, 5 Sep 2017 09:14:42 +0000 (11:14 +0200)]
docs/curl_mime_*.3: added examples

7 years agoconfigure: add MultiSSL to FEATURES when enabled
Daniel Stenberg [Tue, 5 Sep 2017 08:45:09 +0000 (10:45 +0200)]
configure: add MultiSSL to FEATURES when enabled

...for curl-config and its corresponding test 1014

7 years agohttp-proxy: treat all 2xx as CONNECT success
Daniel Stenberg [Mon, 4 Sep 2017 08:45:02 +0000 (10:45 +0200)]
http-proxy: treat all 2xx as CONNECT success

Added test 1904 to verify.

Reported-by: Lawrence Wagerfield
Fixes #1859
Closes #1860

7 years agoMAIL-ETIQUETTE: added "1.9 Your emails are public"
Daniel Stenberg [Tue, 5 Sep 2017 07:29:11 +0000 (09:29 +0200)]
MAIL-ETIQUETTE: added "1.9 Your emails are public"

7 years agocurl.h: fix "unused checksrc ignore", remove dangling reference
Daniel Stenberg [Mon, 4 Sep 2017 17:59:11 +0000 (19:59 +0200)]
curl.h: fix "unused checksrc ignore", remove dangling reference

... to a README file that doesn't exist anymore

7 years agodocs: Update to secure URL versions
Viktor Szakats [Mon, 4 Sep 2017 14:08:54 +0000 (14:08 +0000)]
docs: Update to secure URL versions

7 years agomime: use CURL_ZERO_TERMINATED in examples
Viktor Szakats [Mon, 4 Sep 2017 13:58:10 +0000 (13:58 +0000)]
mime: use CURL_ZERO_TERMINATED in examples

and some minor whitespace fixes

7 years agoschannel: return CURLE_SSL_CACERT on failed verification
Daniel Stenberg [Sun, 3 Sep 2017 22:02:29 +0000 (00:02 +0200)]
schannel: return CURLE_SSL_CACERT on failed verification

... not *CACERT_BADFILE as it isn't really because of a bad file.

Bug: https://curl.haxx.se/mail/lib-2017-09/0002.html
Closes #1858

7 years agotest1135: fixed after bd8070085f9
Daniel Stenberg [Mon, 4 Sep 2017 09:44:42 +0000 (11:44 +0200)]
test1135: fixed after bd8070085f9

7 years agoexamples/post-callback: stop returning one byte at a time
Daniel Stenberg [Mon, 4 Sep 2017 09:39:59 +0000 (11:39 +0200)]
examples/post-callback: stop returning one byte at a time

... since people copy and paste code from this example and thus they get
an inefficient POST operation without a good reason and sometimes
without understanding why.

Instead this now returns as much data as possible.

7 years agoRELEASE-NOTES: fixed the function counter script
Daniel Stenberg [Mon, 4 Sep 2017 07:40:04 +0000 (09:40 +0200)]
RELEASE-NOTES: fixed the function counter script

7 years agocurl.h: make the curl_strequal() protos use the same style
Daniel Stenberg [Mon, 4 Sep 2017 07:38:19 +0000 (09:38 +0200)]
curl.h: make the curl_strequal() protos use the same style

... as the other functions. Makes it easier to machine-parse!

7 years agodocs: curl_mime_*.3 man page formatting edits
Daniel Stenberg [Mon, 4 Sep 2017 07:20:24 +0000 (09:20 +0200)]
docs: curl_mime_*.3 man page formatting edits

7 years agoRELEASE-NOTES: synced with 1ab9e9b50
Daniel Stenberg [Mon, 4 Sep 2017 06:34:53 +0000 (08:34 +0200)]
RELEASE-NOTES: synced with 1ab9e9b50

7 years agolib: bump version info (soname). Adapt and reenable test 1135.
Patrick Monnerat [Sun, 3 Sep 2017 23:35:53 +0000 (00:35 +0100)]
lib: bump version info (soname). Adapt and reenable test 1135.

7 years agoheaders: move the global_sslset() proto from multi.h to curl.h
Daniel Stenberg [Sun, 3 Sep 2017 21:51:42 +0000 (23:51 +0200)]
headers: move the global_sslset() proto from multi.h to curl.h

As it was added to multi.h simply to not break test 1135, which now has
been disabled due to the mime API addition anyway and su we can now move
the sslset stuff to where the other curl_global_* prototypes are.

7 years agomime: fix signed/unsigned conversions.
Patrick Monnerat [Sun, 3 Sep 2017 16:48:15 +0000 (17:48 +0100)]
mime: fix signed/unsigned conversions.

Use and generate CURL_ZERO_TERMINATED in curl tool and tests.

7 years agotool_formparse: fix some trivial warnings
Jay Satiro [Sun, 3 Sep 2017 16:13:44 +0000 (12:13 -0400)]
tool_formparse: fix some trivial warnings

7 years agomime: use size_t instead of ssize_t in public API interface.
Patrick Monnerat [Sun, 3 Sep 2017 15:10:55 +0000 (16:10 +0100)]
mime: use size_t instead of ssize_t in public API interface.

To support telling a string is nul-terminated, symbol CURL_ZERO_TERMINATED
has been introduced.

Documentation updated accordingly.

symbols in versions updated. Added form API symbols deprecation info.

7 years agomime: remove support "-" stdin pseudo-file name in curl_mime_filedata().
Patrick Monnerat [Sun, 3 Sep 2017 13:45:43 +0000 (14:45 +0100)]
mime: remove support "-" stdin pseudo-file name in curl_mime_filedata().

This feature is badly supported in Windows: as a replacement, a caller has
to use curl_mime_data_cb() with fread, fseek and possibly fclose
callbacks to process opened files.

The cli tool and documentation are updated accordingly.

The feature is however kept internally for form API compatibility, with
the known caveats it always had.

As a side effect, stdin size is not determined by the cli tool even if
possible and this results in a chunked transfer encoding. Test 173 is
updated accordingly.

7 years agomime: fix some implicit curl_off_t --> size_t conversion warnings.
Patrick Monnerat [Sun, 3 Sep 2017 09:18:58 +0000 (10:18 +0100)]
mime: fix some implicit curl_off_t --> size_t conversion warnings.

7 years agomime: tests and examples.
Patrick Monnerat [Sat, 2 Sep 2017 18:08:45 +0000 (19:08 +0100)]
mime: tests and examples.

Additional mime-specific tests.
Existing tests updated to reflect small differences (Expect: 100-continue,
data size change due to empty lines, etc).
Option -F headers= keyword added to tests.
test1135 disabled until the entry point order change is resolved.
New example smtp-mime.
Examples postit2 and multi-post converted from form API to mime API.

7 years agomime: use in curl cli tool instead of form API.
Patrick Monnerat [Sat, 2 Sep 2017 17:17:33 +0000 (18:17 +0100)]
mime: use in curl cli tool instead of form API.

Extended -F option syntax to support multipart mail messages.
-F keyword headers= added to include custom headers in parts.
Documentation upgraded.

7 years agomime: new MIME API.
Patrick Monnerat [Sat, 2 Sep 2017 16:47:10 +0000 (17:47 +0100)]
mime: new MIME API.

Available in HTTP, SMTP and IMAP.
Deprecates the FORM API.
See CURLOPT_MIMEPOST.
Lib code and associated documentation.