git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

lib: use lib source directory as base include path

Browse Source 
Backtrack on previous change that aimed to solve the wrong `share.h`
being included. It turns out it did not fix this issue. At the same time
it introduced relative header filenames and the need to include the same
headers differently depending on the source files' location, reducing
readability and editability.

Replace this method by re-adding curl's lib source directory to the
header path and addressing headers by the their full, relative name to
that base directory. Aligning with this method already used in src and
tests.

With these advantages:
- makes includes easier to read, recognize, grep, sort, write, and copy
  between sources,
- syncs the way these headers are included across curl components,
- avoids the ambiguity between system `schannel.h`, `rustls.h` vs.
  local headers using the same names in `lib/vtls`,
- silences clang-tidy `readability-duplicate-include` checker, which
  detects the above issue,
  Ref: https://clang.llvm.org/extra/clang-tidy/checks/readability/duplicate-include.html
- possibly silences TIOBE coding standard warnings:
  `6.10.2.a: Don't use relative paths in #include statements.`
- long shot: it works well with concatenated test sources, for
  clang-tidy-friendly custom unity builds. Ref: #20667

Slight downside: it's not enforced.

If there happens to be a collision between a local `lib/*.h` header and
a system one, the solution is to rename (possibly with its `.c`
counterpart) into the `curl_` namespace. This is also the method used by
curl in the past.

Also:
- curlx/inet_pton: reduce scope of an include.
- toolx/tool_time: apply this to an include, and update VS project
  files accordingly. Also dropping unnecessary lib/curlx header path.
- clang-tidy: enable `readability-duplicate-include`.

Follow-up to 3887069c66 #19676
Follow-up to 625f2c1644 #16991 #16949

Closes #20623
This commit is contained in:
Viktor Szakats 2026-02-19 00:44:43 +01:00
parent 6ad50dc285
commit 3058ed3df8
No known key found for this signature in database
95 changed files with 545 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-tidy.yml
View File

@ -17,6 +17,7 @@ Checks:
- misc-const-correctness
- misc-header-include-cycle
- portability-*
- readability-duplicate-include
- readability-named-parameter
- readability-redundant-control-flow
- readability-redundant-preprocessor

1
lib/CMakeLists.txt
View File

@ -38,6 +38,7 @@ list(APPEND HHEADERS "${CMAKE_CURRENT_BINARY_DIR}/curl_config.h")
set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
"${PROJECT_BINARY_DIR}/lib" # for "curl_config.h"
"${PROJECT_SOURCE_DIR}/lib"
)
if(CURL_BUILD_TESTING)

1
lib/Makefile.am
View File

@ -58,6 +58,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(srcdir)
# Prevent LIBS from being used for all link targets

4
lib/curlx/base64.c
View File

@ -24,9 +24,9 @@
/* Base64 encoding/decoding */
#include "../curl_setup.h"
#include "curl_setup.h"
#include "base64.h"
#include "curlx/base64.h"
/* ---- Base64 Encoding/Decoding Table --- */
const char curlx_base64encdec[] =

4
lib/curlx/basename.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef HAVE_BASENAME
#include "basename.h"
#include "curlx/basename.h"
/*
(Quote from The Open Group Base Specifications Issue 6 IEEE Std 1003.1, 2004

2
lib/curlx/basename.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef HAVE_BASENAME
char *curlx_basename(char *path);

34
lib/curlx/curlx.h
View File

@ -31,22 +31,22 @@
* be.
*/
#include "base64.h" /* for curlx_base64* */
#include "basename.h" /* for curlx_basename() */
#include "dynbuf.h" /* for curlx_dyn_*() */
#include "fopen.h" /* for curlx_f*() */
#include "inet_ntop.h" /* for curlx_inet_ntop() */
#include "inet_pton.h" /* for curlx_inet_pton() */
#include "multibyte.h" /* for curlx_convert_*() */
#include "nonblock.h" /* for curlx_nonblock() */
#include "strcopy.h" /* for curlx_strcopy() */
#include "strdup.h" /* for curlx_memdup*() and curlx_tcsdup() */
#include "strerr.h" /* for curlx_strerror() */
#include "strparse.h" /* for curlx_str_* parsing functions */
#include "timediff.h" /* for timediff_t type and related functions */
#include "timeval.h" /* for curlx_now type and related functions */
#include "version_win32.h" /* for curlx_verify_windows_version() */
#include "wait.h" /* for curlx_wait_ms() */
#include "winapi.h" /* for curlx_winapi_strerror() */
#include "curlx/base64.h" /* for curlx_base64* */
#include "curlx/basename.h" /* for curlx_basename() */
#include "curlx/dynbuf.h" /* for curlx_dyn_*() */
#include "curlx/fopen.h" /* for curlx_f*() */
#include "curlx/inet_ntop.h" /* for curlx_inet_ntop() */
#include "curlx/inet_pton.h" /* for curlx_inet_pton() */
#include "curlx/multibyte.h" /* for curlx_convert_*() */
#include "curlx/nonblock.h" /* for curlx_nonblock() */
#include "curlx/strcopy.h" /* for curlx_strcopy() */
#include "curlx/strdup.h" /* for curlx_memdup*() and curlx_tcsdup() */
#include "curlx/strerr.h" /* for curlx_strerror() */
#include "curlx/strparse.h" /* for curlx_str_* parsing functions */
#include "curlx/timediff.h" /* for timediff_t type and related functions */
#include "curlx/timeval.h" /* for curlx_now type and related functions */
#include "curlx/version_win32.h" /* for curlx_verify_windows_version() */
#include "curlx/wait.h" /* for curlx_wait_ms() */
#include "curlx/winapi.h" /* for curlx_winapi_strerror() */
#endif /* HEADER_CURL_CURLX_H */

6
lib/curlx/dynbuf.c
View File

@ -21,10 +21,10 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "dynbuf.h"
#include "../curl_printf.h"
#include "curlx/dynbuf.h"
#include "curl_printf.h"
#define MIN_FIRST_ALLOC 32

8
lib/curlx/fopen.c
View File

@ -21,9 +21,9 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "fopen.h"
#include "curlx/fopen.h"
int curlx_fseek(void *stream, curl_off_t offset, int whence)
{
@ -42,8 +42,8 @@ int curlx_fseek(void *stream, curl_off_t offset, int whence)
#include <share.h> /* for _SH_DENYNO */
#include "multibyte.h"
#include "timeval.h"
#include "curlx/multibyte.h"
#include "curlx/timeval.h"
#ifdef CURL_MEMDEBUG
/*

4
lib/curlx/fopen.h
View File

@ -23,9 +23,9 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "multibyte.h"
#include "curlx/multibyte.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h> /* for open() and attributes */

8
lib/curlx/inet_ntop.c
View File

@ -16,7 +16,7 @@
*
* SPDX-License-Identifier: ISC
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef HAVE_INET_NTOP
@ -30,9 +30,9 @@
#include <arpa/inet.h>
#endif
#include "inet_ntop.h"
#include "snprintf.h"
#include "strcopy.h"
#include "curlx/inet_ntop.h"
#include "curlx/snprintf.h"
#include "curlx/strcopy.h"
#define IN6ADDRSZ 16
/* #define INADDRSZ 4 */

2
lib/curlx/inet_ntop.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef HAVE_INET_NTOP
#ifdef HAVE_NETINET_IN_H

6
lib/curlx/inet_pton.c
View File

@ -17,7 +17,7 @@
*
* SPDX-License-Identifier: ISC
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef HAVE_INET_PTON
@ -31,8 +31,8 @@
#include <arpa/inet.h>
#endif
#include "inet_pton.h"
#include "strparse.h"
#include "curlx/inet_pton.h"
#include "curlx/strparse.h"
#define IN6ADDRSZ 16
#define INADDRSZ 4

2
lib/curlx/inet_pton.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef HAVE_INET_PTON
#ifdef HAVE_NETINET_IN_H

4
lib/curlx/multibyte.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(_WIN32) && defined(UNICODE)
#include "multibyte.h"
#include "curlx/multibyte.h"
/*
* MultiByte conversions using Windows kernel32 library.

2
lib/curlx/multibyte.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef _WIN32

4
lib/curlx/nonblock.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
@ -35,7 +35,7 @@
#include <inet.h>
#endif
#include "nonblock.h"
#include "curlx/nonblock.h"
/*
* curlx_nonblock() set the given socket to either blocking or non-blocking

4
lib/curlx/strcopy.c
View File

@ -21,9 +21,9 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "strcopy.h"
#include "curlx/strcopy.h"
/*
* curlx_strcopy() is a replacement for strcpy.

4
lib/curlx/strdup.c
View File

@ -21,13 +21,13 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef _WIN32
#include <wchar.h>
#endif
#include "strdup.h"
#include "curlx/strdup.h"
#ifdef _WIN32
/***************************************************************************

2
lib/curlx/strdup.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef _WIN32
wchar_t *curlx_wcsdup(const wchar_t *src); /* for curlx_tcsdup() */

10
lib/curlx/strerr.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef HAVE_STRERROR_R
# if (!defined(HAVE_POSIX_STRERROR_R) && \
@ -31,10 +31,10 @@
# endif
#endif
#include "winapi.h"
#include "snprintf.h"
#include "strerr.h"
#include "strcopy.h"
#include "curlx/winapi.h"
#include "curlx/snprintf.h"
#include "curlx/strerr.h"
#include "curlx/strcopy.h"
#ifdef USE_WINSOCK
/* This is a helper function for curlx_strerror that converts Winsock error

2
lib/curlx/strparse.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "strparse.h"
#include "curlx/strparse.h"
void curlx_str_init(struct Curl_str *out)
{

2
lib/curlx/strparse.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#define STRE_OK 0
#define STRE_BIG 1

2
lib/curlx/timediff.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "timediff.h"
#include "curlx/timediff.h"
/*
* Converts number of milliseconds into a timeval structure.

2
lib/curlx/timediff.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
/* Use a larger type even for 32-bit time_t systems so that we can keep
microsecond accuracy in it */

4
lib/curlx/timeval.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "timeval.h"
#include "curlx/timeval.h"
#ifdef _WIN32
#include "../system_win32.h"
#include "system_win32.h"
LARGE_INTEGER Curl_freq;

4
lib/curlx/timeval.h
View File

@ -23,9 +23,9 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "timediff.h"
#include "curlx/timediff.h"
struct curltime {
time_t tv_sec; /* seconds */

4
lib/curlx/version_win32.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef _WIN32
#include "version_win32.h"
#include "curlx/version_win32.h"
/* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */

2
lib/curlx/version_win32.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef _WIN32

6
lib/curlx/wait.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef HAVE_SELECT
#error "We cannot compile without select() support."
@ -37,8 +37,8 @@
#include <dos.h> /* delay() */
#endif
#include "timediff.h"
#include "wait.h"
#include "curlx/timediff.h"
#include "curlx/wait.h"
/*
* Internal function used for waiting a specific amount of ms in

2
lib/curlx/wait.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
int curlx_wait_ms(timediff_t timeout_ms);

4
lib/curlx/warnless.c
View File

@ -21,9 +21,9 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "warnless.h"
#include "curlx/warnless.h"
#if defined(__INTEL_COMPILER) && defined(__unix__)

8
lib/curlx/winapi.c
View File

@ -21,16 +21,16 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
/*
* curlx_winapi_strerror:
* Variant of curlx_strerror if the error code is definitely Windows API.
*/
#ifdef _WIN32
#include "winapi.h"
#include "snprintf.h"
#include "strcopy.h"
#include "curlx/winapi.h"
#include "curlx/snprintf.h"
#include "curlx/strcopy.h"
/* This is a helper function for curlx_strerror that converts Windows API error
* codes (GetLastError) to error messages.

4
lib/vauth/cleartext.c
View File

@ -24,13 +24,13 @@
* Draft LOGIN SASL Mechanism <draft-murchison-sasl-login-00.txt>
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \
!defined(CURL_DISABLE_POP3) || \
(!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
#include "vauth.h"
#include "vauth/vauth.h"
/*
* Curl_auth_create_plain_message()

8
lib/vauth/cram.c
View File

@ -23,13 +23,13 @@
* RFC2195 CRAM-MD5 authentication
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef CURL_DISABLE_DIGEST_AUTH
#include "vauth.h"
#include "../curl_hmac.h"
#include "../curl_md5.h"
#include "vauth/vauth.h"
#include "curl_hmac.h"
#include "curl_md5.h"
/*
* Curl_auth_create_cram_md5_message()

18
lib/vauth/digest.c
View File

@ -24,18 +24,18 @@
* RFC7616 DIGEST-SHA256, DIGEST-SHA512-256 authentication
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef CURL_DISABLE_DIGEST_AUTH
#include "vauth.h"
#include "digest.h"
#include "../curlx/base64.h"
#include "../curl_md5.h"
#include "../curl_sha256.h"
#include "../curl_sha512_256.h"
#include "../curlx/strparse.h"
#include "../rand.h"
#include "vauth/vauth.h"
#include "vauth/digest.h"
#include "curlx/base64.h"
#include "curl_md5.h"
#include "curl_sha256.h"
#include "curl_sha512_256.h"
#include "curlx/strparse.h"
#include "rand.h"
#ifndef USE_WINDOWS_SSPI
#define SESSION_ALGO 1 /* for algos with this bit set */

2
lib/vauth/digest.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifndef CURL_DISABLE_DIGEST_AUTH

16
lib/vauth/digest_sspi.c
View File

@ -24,17 +24,17 @@
* RFC2831 DIGEST-MD5 authentication
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_DIGEST_AUTH)
#include "vauth.h"
#include "digest.h"
#include "../curlx/multibyte.h"
#include "../curl_trc.h"
#include "../curlx/strdup.h"
#include "../strcase.h"
#include "../strerror.h"
#include "vauth/vauth.h"
#include "vauth/digest.h"
#include "curlx/multibyte.h"
#include "curl_trc.h"
#include "curlx/strdup.h"
#include "strcase.h"
#include "strerror.h"
/*
* Curl_auth_is_digest_supported()

6
lib/vauth/gsasl.c
View File

@ -23,12 +23,12 @@
* RFC5802 SCRAM-SHA-1 authentication
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_GSASL
#include "vauth.h"
#include "../curl_trc.h"
#include "vauth/vauth.h"
#include "curl_trc.h"
#include <gsasl.h>

10
lib/vauth/krb5_gssapi.c
View File

@ -24,14 +24,14 @@
* RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
#include "vauth.h"
#include "../curl_sasl.h"
#include "../curl_gssapi.h"
#include "../curl_trc.h"
#include "vauth/vauth.h"
#include "curl_sasl.h"
#include "curl_gssapi.h"
#include "curl_trc.h"
#if defined(__GNUC__) && defined(__APPLE__)
#pragma GCC diagnostic push

6
lib/vauth/krb5_sspi.c
View File

@ -23,12 +23,12 @@
* RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
#include "vauth.h"
#include "../curl_trc.h"
#include "vauth/vauth.h"
#include "curl_trc.h"
/*
* Curl_auth_is_gssapi_supported()

14
lib/vauth/ntlm.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
@ -34,12 +34,12 @@
#define DEBUG_ME 0
#include "vauth.h"
#include "../curl_trc.h"
#include "../curl_ntlm_core.h"
#include "../rand.h"
#include "../curlx/strdup.h"
#include "../curl_endian.h"
#include "vauth/vauth.h"
#include "curl_trc.h"
#include "curl_ntlm_core.h"
#include "rand.h"
#include "curlx/strdup.h"
#include "curl_endian.h"
/* "NTLMSSP" signature is always in ASCII regardless of the platform */
#define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50"

10
lib/vauth/ntlm_sspi.c
View File

@ -21,14 +21,14 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM)
#include "vauth.h"
#include "../curl_ntlm_core.h"
#include "../curl_trc.h"
#include "../curlx/strdup.h"
#include "vauth/vauth.h"
#include "curl_ntlm_core.h"
#include "curl_trc.h"
#include "curlx/strdup.h"
/*
* Curl_auth_is_ntlm_supported()

4
lib/vauth/oauth2.c
View File

@ -23,13 +23,13 @@
* RFC6749 OAuth 2.0 Authorization Framework
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \
!defined(CURL_DISABLE_POP3) || \
(!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
#include "vauth.h"
#include "vauth/vauth.h"
/*
* Curl_auth_create_oauth_bearer_message()

10
lib/vauth/spnego_gssapi.c
View File

@ -23,14 +23,14 @@
* RFC4178 Simple and Protected GSS-API Negotiation Mechanism
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(HAVE_GSSAPI) && defined(USE_SPNEGO)
#include "vauth.h"
#include "../curlx/base64.h"
#include "../curl_gssapi.h"
#include "../curl_trc.h"
#include "vauth/vauth.h"
#include "curlx/base64.h"
#include "curl_gssapi.h"
#include "curl_trc.h"
#if defined(__GNUC__) && defined(__APPLE__)
#pragma GCC diagnostic push

10
lib/vauth/spnego_sspi.c
View File

@ -23,14 +23,14 @@
* RFC4178 Simple and Protected GSS-API Negotiation Mechanism
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO)
#include "vauth.h"
#include "../curlx/base64.h"
#include "../curl_trc.h"
#include "../strerror.h"
#include "vauth/vauth.h"
#include "curlx/base64.h"
#include "curl_trc.h"
#include "strerror.h"
/*
* Curl_auth_is_spnego_supported()

8
lib/vauth/vauth.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "vauth.h"
#include "../curlx/multibyte.h"
#include "../url.h"
#include "vauth/vauth.h"
#include "curlx/multibyte.h"
#include "url.h"
/*
* Curl_auth_build_spn()

10
lib/vauth/vauth.h
View File

@ -23,11 +23,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#include "../bufref.h"
#include "../curlx/dynbuf.h"
#include "../urldata.h"
#include "bufref.h"
#include "curlx/dynbuf.h"
#include "urldata.h"
struct Curl_easy;
struct connectdata;
@ -49,7 +49,7 @@ struct gsasldata;
#endif
#ifdef USE_WINDOWS_SSPI
#include "../curl_sspi.h"
#include "curl_sspi.h"
#define GSS_ERROR(status) ((status) & 0x80000000)
#endif

54
lib/vquic/curl_ngtcp2.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && defined(USE_NGTCP2) && defined(USE_NGHTTP3)
#include <ngtcp2/ngtcp2.h>
@ -36,38 +36,38 @@
#else
#include <ngtcp2/ngtcp2_crypto_quictls.h>
#endif
#include "../vtls/openssl.h"
#include "vtls/openssl.h"
#elif defined(USE_GNUTLS)
#include <ngtcp2/ngtcp2_crypto_gnutls.h>
#include "../vtls/gtls.h"
#include "vtls/gtls.h"
#elif defined(USE_WOLFSSL)
#include <ngtcp2/ngtcp2_crypto_wolfssl.h>
#include "../vtls/wolfssl.h"
#include "vtls/wolfssl.h"
#endif
#include "../urldata.h"
#include "../url.h"
#include "../uint-hash.h"
#include "../curl_trc.h"
#include "../rand.h"
#include "../multiif.h"
#include "../cfilters.h"
#include "../cf-socket.h"
#include "../connect.h"
#include "../progress.h"
#include "../curlx/fopen.h"
#include "../curlx/dynbuf.h"
#include "../http1.h"
#include "../select.h"
#include "../transfer.h"
#include "../bufref.h"
#include "vquic.h"
#include "vquic_int.h"
#include "vquic-tls.h"
#include "../vtls/keylog.h"
#include "../vtls/vtls.h"
#include "../vtls/vtls_scache.h"
#include "curl_ngtcp2.h"
#include "urldata.h"
#include "url.h"
#include "uint-hash.h"
#include "curl_trc.h"
#include "rand.h"
#include "multiif.h"
#include "cfilters.h"
#include "cf-socket.h"
#include "connect.h"
#include "progress.h"
#include "curlx/fopen.h"
#include "curlx/dynbuf.h"
#include "http1.h"
#include "select.h"
#include "transfer.h"
#include "bufref.h"
#include "vquic/vquic.h"
#include "vquic/vquic_int.h"
#include "vquic/vquic-tls.h"
#include "vtls/keylog.h"
#include "vtls/vtls.h"
#include "vtls/vtls_scache.h"
#include "vquic/curl_ngtcp2.h"
#define QUIC_MAX_STREAMS (256 * 1024)

4
lib/vquic/curl_ngtcp2.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && defined(USE_NGTCP2) && defined(USE_NGHTTP3)
@ -46,7 +46,7 @@
struct Curl_cfilter;
#include "../urldata.h"
#include "urldata.h"
void Curl_ngtcp2_ver(char *p, size_t len);

47
lib/vquic/curl_quiche.c
View File

@ -21,34 +21,35 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && defined(USE_QUICHE)
#include <quiche.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include "../bufq.h"
#include "../uint-hash.h"
#include "../urldata.h"
#include "../cfilters.h"
#include "../cf-socket.h"
#include "../curl_trc.h"
#include "../rand.h"
#include "../multiif.h"
#include "../connect.h"
#include "../progress.h"
#include "../select.h"
#include "../http1.h"
#include "vquic.h"
#include "vquic_int.h"
#include "vquic-tls.h"
#include "curl_quiche.h"
#include "../transfer.h"
#include "../url.h"
#include "../bufref.h"
#include "../vtls/openssl.h"
#include "../vtls/keylog.h"
#include "../vtls/vtls.h"
#include "bufq.h"
#include "uint-hash.h"
#include "urldata.h"
#include "cfilters.h"
#include "cf-socket.h"
#include "curl_trc.h"
#include "rand.h"
#include "multiif.h"
#include "connect.h"
#include "progress.h"
#include "select.h"
#include "http1.h"
#include "vquic/vquic.h"
#include "vquic/vquic_int.h"
#include "vquic/vquic-tls.h"
#include "vquic/curl_quiche.h"
#include "transfer.h"
#include "url.h"
#include "bufref.h"
#include "vtls/openssl.h"
#include "vtls/keylog.h"
#include "vtls/vtls.h"
/* HTTP/3 error values defined in RFC 9114, ch. 8.1 */
#define CURL_H3_NO_ERROR 0x0100

2
lib/vquic/curl_quiche.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && defined(USE_QUICHE)

20
lib/vquic/vquic-tls.c
View File

@ -21,34 +21,34 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_HTTP3) && \
(defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL))
#ifdef USE_OPENSSL
#include <openssl/err.h>
#include "../vtls/openssl.h"
#include "vtls/openssl.h"
#elif defined(USE_GNUTLS)
#include <gnutls/abstract.h>
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
#include <gnutls/crypto.h>
#include <nettle/sha2.h>
#include "../vtls/gtls.h"
#include "vtls/gtls.h"
#elif defined(USE_WOLFSSL)
#include <wolfssl/options.h>
#include <wolfssl/ssl.h>
#include <wolfssl/quic.h>
#include "../vtls/wolfssl.h"
#include "vtls/wolfssl.h"
#endif
#include "../urldata.h"
#include "../cfilters.h"
#include "../vtls/keylog.h"
#include "../vtls/vtls.h"
#include "../vtls/vtls_scache.h"
#include "vquic-tls.h"
#include "urldata.h"
#include "cfilters.h"
#include "vtls/keylog.h"
#include "vtls/vtls.h"
#include "vtls/vtls_scache.h"
#include "vquic/vquic-tls.h"
CURLcode Curl_vquic_tls_init(struct curl_tls_ctx *ctx,
struct Curl_cfilter *cf,

12
lib/vquic/vquic-tls.h
View File

@ -23,17 +23,17 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_HTTP3) && \
(defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL))
#include "../bufq.h"
#include "../vtls/vtls.h"
#include "../vtls/vtls_int.h"
#include "bufq.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "../vtls/openssl.h"
#include "../vtls/wolfssl.h"
#include "vtls/openssl.h"
#include "vtls/wolfssl.h"
struct ssl_peer;
struct Curl_ssl_session;

32
lib/vquic/vquic.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "../urldata.h"
#include "vquic.h"
#include "curl_setup.h"
#include "urldata.h"
#include "vquic/vquic.h"
#include "../curl_trc.h"
#include "curl_trc.h"
#if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP3)
@ -37,18 +37,18 @@
#include <nghttp3/nghttp3.h>
#endif
#include "../bufq.h"
#include "../curlx/dynbuf.h"
#include "../curlx/fopen.h"
#include "../cfilters.h"
#include "curl_ngtcp2.h"
#include "curl_quiche.h"
#include "../multiif.h"
#include "../progress.h"
#include "../rand.h"
#include "vquic_int.h"
#include "../curlx/strerr.h"
#include "../curlx/strparse.h"
#include "bufq.h"
#include "curlx/dynbuf.h"
#include "curlx/fopen.h"
#include "cfilters.h"
#include "vquic/curl_ngtcp2.h"
#include "vquic/curl_quiche.h"
#include "multiif.h"
#include "progress.h"
#include "rand.h"
#include "vquic/vquic_int.h"
#include "curlx/strerr.h"
#include "curlx/strparse.h"
#define NW_CHUNK_SIZE (64 * 1024)

2
lib/vquic/vquic.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP3)
struct Curl_cfilter;

4
lib/vquic/vquic_int.h
View File

@ -23,11 +23,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_HTTP3
#include "../bufq.h"
#include "bufq.h"
#define MAX_UDP_PAYLOAD_SIZE 1452

32
lib/vssh/libssh.c
View File

@ -24,7 +24,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_LIBSSH
@ -42,21 +42,21 @@
#include <inet.h>
#endif
#include "../urldata.h"
#include "../sendf.h"
#include "../curl_trc.h"
#include "../hostip.h"
#include "../progress.h"
#include "../transfer.h"
#include "ssh.h"
#include "../url.h"
#include "../cfilters.h"
#include "../connect.h"
#include "../parsedate.h" /* for the week day and month names */
#include "../curlx/strparse.h"
#include "../multiif.h"
#include "../select.h"
#include "vssh.h"
#include "urldata.h"
#include "sendf.h"
#include "curl_trc.h"
#include "hostip.h"
#include "progress.h"
#include "transfer.h"
#include "vssh/ssh.h"
#include "url.h"
#include "cfilters.h"
#include "connect.h"
#include "parsedate.h" /* for the week day and month names */
#include "curlx/strparse.h"
#include "multiif.h"
#include "select.h"
#include "vssh/vssh.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>

36
lib/vssh/libssh2.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_LIBSSH2
@ -41,23 +41,23 @@
#include <inet.h>
#endif
#include "../urldata.h"
#include "../sendf.h"
#include "../curl_trc.h"
#include "../hostip.h"
#include "../progress.h"
#include "../transfer.h"
#include "ssh.h"
#include "../url.h"
#include "../cfilters.h"
#include "../connect.h"
#include "../parsedate.h" /* for the week day and month names */
#include "../multiif.h"
#include "../select.h"
#include "../curlx/fopen.h"
#include "vssh.h"
#include "../curlx/strparse.h"
#include "../curlx/base64.h" /* for base64 encoding/decoding */
#include "urldata.h"
#include "sendf.h"
#include "curl_trc.h"
#include "hostip.h"
#include "progress.h"
#include "transfer.h"
#include "vssh/ssh.h"
#include "url.h"
#include "cfilters.h"
#include "connect.h"
#include "parsedate.h" /* for the week day and month names */
#include "multiif.h"
#include "select.h"
#include "curlx/fopen.h"
#include "vssh/vssh.h"
#include "curlx/strparse.h"
#include "curlx/base64.h" /* for base64 encoding/decoding */
static const char *sftp_libssh2_strerror(unsigned long err)
{

4
lib/vssh/ssh.h
View File

@ -23,8 +23,8 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "../urldata.h"
#include "curl_setup.h"
#include "urldata.h"
extern const struct Curl_protocol Curl_protocol_sftp;
extern const struct Curl_protocol Curl_protocol_scp;

12
lib/vssh/vssh.c
View File

@ -21,15 +21,15 @@
* SPDX-License-Identifier: curl AND ISC
*
***************************************************************************/
#include "../curl_setup.h"
#include "ssh.h"
#include "curl_setup.h"
#include "vssh/ssh.h"
#ifdef USE_SSH
#include "vssh.h"
#include "../curlx/strparse.h"
#include "../curl_trc.h"
#include "../escape.h"
#include "vssh/vssh.h"
#include "curlx/strparse.h"
#include "curl_trc.h"
#include "escape.h"
#ifdef CURLVERBOSE
const char *Curl_ssh_statename(sshstate state)

4
lib/vssh/vssh.h
View File

@ -23,11 +23,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SSH
#include "../urldata.h"
#include "urldata.h"
CURLcode Curl_getworkingpath(struct Curl_easy *data,
const char *homedir,

12
lib/vtls/apple.c
View File

@ -38,15 +38,15 @@
https://httpd.apache.org/docs/2.0/ssl/ssl_intro.html
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_APPLE_SECTRUST
#include "../urldata.h"
#include "../cfilters.h"
#include "../curl_trc.h"
#include "vtls.h"
#include "apple.h"
#include "urldata.h"
#include "cfilters.h"
#include "curl_trc.h"
#include "vtls/vtls.h"
#include "vtls/apple.h"
#include <Security/Security.h>

2
lib/vtls/apple.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_APPLE_SECTRUST
struct Curl_cfilter;

4
lib/vtls/cipher_suite.c
View File

@ -21,11 +21,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_MBEDTLS) || defined(USE_RUSTLS)
#include "cipher_suite.h"
#include "vtls/cipher_suite.h"
/*
* To support the CURLOPT_SSL_CIPHER_LIST option on SSL backends

2
lib/vtls/cipher_suite.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_MBEDTLS) || defined(USE_RUSTLS)

32
lib/vtls/gtls.c
View File

@ -28,7 +28,7 @@
* Note: do not use the GnuTLS' *_t variable type names in this source code,
* since they were not present in 1.0.X.
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_GNUTLS
@ -38,21 +38,21 @@
#include <gnutls/crypto.h>
#include <nettle/sha2.h>
#include "../urldata.h"
#include "../curl_trc.h"
#include "keylog.h"
#include "gtls.h"
#include "vtls.h"
#include "vtls_int.h"
#include "vtls_scache.h"
#include "apple.h"
#include "../vauth/vauth.h"
#include "../parsedate.h"
#include "../connect.h" /* for the connect timeout */
#include "../progress.h"
#include "../curlx/strdup.h"
#include "../curlx/fopen.h"
#include "x509asn1.h"
#include "urldata.h"
#include "curl_trc.h"
#include "vtls/keylog.h"
#include "vtls/gtls.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "vtls/apple.h"
#include "vauth/vauth.h"
#include "parsedate.h"
#include "connect.h" /* for the connect timeout */
#include "progress.h"
#include "curlx/strdup.h"
#include "curlx/fopen.h"
#include "vtls/x509asn1.h"
/* Enable GnuTLS debugging by defining GTLSDEBUG */
#if 0

5
lib/vtls/gtls.h
View File

@ -23,12 +23,13 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_GNUTLS
#include <gnutls/gnutls.h>
#include "../curlx/timeval.h"
#include "curlx/timeval.h"
#ifdef HAVE_GNUTLS_SRP
/* the function exists */

9
lib/vtls/hostcheck.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_OPENSSL) || defined(USE_SCHANNEL)
/* these backends use functions from this file */
@ -32,9 +32,10 @@
#ifdef HAVE_NETINET_IN6_H
#include <netinet/in6.h>
#endif
#include "../curl_memrchr.h"
#include "hostcheck.h"
#include "../hostip.h"
#include "curl_memrchr.h"
#include "vtls/hostcheck.h"
#include "hostip.h"
/* check the two input strings with given length, but do not
assume they end in nul-bytes */

2
lib/vtls/hostcheck.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_OPENSSL) || defined(USE_SCHANNEL)

8
lib/vtls/keylog.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_OPENSSL) || \
defined(USE_GNUTLS) || \
@ -30,9 +30,9 @@
defined(USE_QUICHE) || \
defined(USE_RUSTLS)
#include "keylog.h"
#include "../escape.h"
#include "../curlx/fopen.h"
#include "vtls/keylog.h"
#include "escape.h"
#include "curlx/fopen.h"
/* The fp for the open SSLKEYLOGFILE, or NULL if not open */
static FILE *keylog_file_fp;

2
lib/vtls/keylog.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#define KEYLOG_LABEL_MAXLEN (sizeof("CLIENT_HANDSHAKE_TRAFFIC_SECRET") - 1)

25
lib/vtls/mbedtls.c
View File

@ -27,7 +27,7 @@
* but vtls.c should ever call or use these functions.
*
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_MBEDTLS
@ -56,17 +56,18 @@
#ifdef MBEDTLS_DEBUG
#include <mbedtls/debug.h>
#endif
#include "cipher_suite.h"
#include "../urldata.h"
#include "../curl_trc.h"
#include "mbedtls.h"
#include "vtls.h"
#include "vtls_int.h"
#include "vtls_scache.h"
#include "x509asn1.h"
#include "../connect.h" /* for the connect timeout */
#include "../curlx/strdup.h"
#include "../curl_sha256.h"
#include "vtls/cipher_suite.h"
#include "urldata.h"
#include "curl_trc.h"
#include "vtls/mbedtls.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "vtls/x509asn1.h"
#include "connect.h" /* for the connect timeout */
#include "curlx/strdup.h"
#include "curl_sha256.h"
/* ALPN for http2 */
#if defined(USE_HTTP2) && defined(MBEDTLS_SSL_ALPN)

2
lib/vtls/mbedtls.h
View File

@ -24,7 +24,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_MBEDTLS

46
lib/vtls/openssl.c
View File

@ -25,7 +25,7 @@
* Source file for all OpenSSL-specific code for the TLS/SSL layer. No code
* but vtls.c should ever call or use these functions.
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_QUICHE) || defined(USE_OPENSSL)
@ -62,28 +62,28 @@
#undef OCSP_RESPONSE
#endif
#include "../urldata.h"
#include "../curl_trc.h"
#include "../httpsrr.h"
#include "../formdata.h" /* for the boundary function */
#include "../url.h" /* for the ssl config check function */
#include "../curlx/inet_pton.h"
#include "openssl.h"
#include "../connect.h"
#include "../progress.h"
#include "vtls.h"
#include "vtls_int.h"
#include "vtls_scache.h"
#include "../vauth/vauth.h"
#include "keylog.h"
#include "hostcheck.h"
#include "../transfer.h"
#include "../multiif.h"
#include "../curlx/strerr.h"
#include "../curlx/strparse.h"
#include "../curlx/strcopy.h"
#include "../curlx/strdup.h"
#include "apple.h"
#include "urldata.h"
#include "curl_trc.h"
#include "httpsrr.h"
#include "formdata.h" /* for the boundary function */
#include "url.h" /* for the ssl config check function */
#include "curlx/inet_pton.h"
#include "vtls/openssl.h"
#include "connect.h"
#include "progress.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "vauth/vauth.h"
#include "vtls/keylog.h"
#include "vtls/hostcheck.h"
#include "transfer.h"
#include "multiif.h"
#include "curlx/strerr.h"
#include "curlx/strparse.h"
#include "curlx/strcopy.h"
#include "curlx/strdup.h"
#include "vtls/apple.h"
#include <openssl/rand.h>
#include <openssl/x509v3.h>

4
lib/vtls/openssl.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_OPENSSL
/*
@ -34,7 +34,7 @@
#include <openssl/ossl_typ.h>
#include <openssl/ssl.h>
#include "../urldata.h"
#include "urldata.h"
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
#define HAVE_OPENSSL3 /* non-fork OpenSSL 3.x or later */

24
lib/vtls/rustls.c
View File

@ -23,23 +23,23 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_RUSTLS
#include <rustls.h>
#include "../curlx/fopen.h"
#include "../curlx/strerr.h"
#include "../urldata.h"
#include "../curl_trc.h"
#include "../httpsrr.h"
#include "vtls.h"
#include "vtls_int.h"
#include "rustls.h"
#include "keylog.h"
#include "cipher_suite.h"
#include "x509asn1.h"
#include "curlx/fopen.h"
#include "curlx/strerr.h"
#include "urldata.h"
#include "curl_trc.h"
#include "httpsrr.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "vtls/rustls.h"
#include "vtls/keylog.h"
#include "vtls/cipher_suite.h"
#include "vtls/x509asn1.h"
struct rustls_ssl_backend_data {
const struct rustls_client_config *config;

2
lib/vtls/rustls.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_RUSTLS

40
lib/vtls/schannel.c
View File

@ -27,7 +27,7 @@
* Source file for all Schannel-specific code for the TLS/SSL layer. No code
* but vtls.c should ever call or use these functions.
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SCHANNEL
@ -35,25 +35,25 @@
#error "cannot compile Schannel support without SSPI."
#endif
#include "schannel.h"
#include "schannel_int.h"
#include "vtls.h"
#include "vtls_int.h"
#include "vtls_scache.h"
#include "../curl_trc.h"
#include "../connect.h" /* for the connect timeout */
#include "../curlx/strdup.h"
#include "../strerror.h"
#include "../select.h" /* for the socket readiness */
#include "../curlx/fopen.h"
#include "../curlx/multibyte.h"
#include "x509asn1.h"
#include "../system_win32.h"
#include "../curlx/version_win32.h"
#include "../rand.h"
#include "../curlx/strparse.h"
#include "../progress.h"
#include "../curl_sha256.h"
#include "vtls/schannel.h"
#include "vtls/schannel_int.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "curl_trc.h"
#include "connect.h" /* for the connect timeout */
#include "curlx/strdup.h"
#include "strerror.h"
#include "select.h" /* for the socket readiness */
#include "curlx/fopen.h"
#include "curlx/multibyte.h"
#include "vtls/x509asn1.h"
#include "system_win32.h"
#include "curlx/version_win32.h"
#include "rand.h"
#include "curlx/strparse.h"
#include "progress.h"
#include "curl_sha256.h"
/* Some verbose debug messages are wrapped by SCH_DEV() instead of DEBUGF()
* and only shown if CURL_SCHANNEL_DEV_DEBUG was defined at build time. These

8
lib/vtls/schannel.h
View File

@ -24,15 +24,15 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SCHANNEL
#include <schannel.h>
#include "../curl_sspi.h"
#include "../cfilters.h"
#include "../urldata.h"
#include "curl_sspi.h"
#include "cfilters.h"
#include "urldata.h"
extern const struct Curl_ssl Curl_ssl_schannel;

6
lib/vtls/schannel_int.h
View File

@ -24,12 +24,12 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SCHANNEL
#include "vtls.h"
#include "../curl_sha256.h"
#include "vtls/vtls.h"
#include "curl_sha256.h"
#if defined(_MSC_VER) && (_MSC_VER < 1700)
/* Workaround for warning:

26
lib/vtls/schannel_verify.c
View File

@ -27,7 +27,7 @@
* Source file for Schannel-specific certificate verification. This code should
* only be invoked by code in schannel.c.
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SCHANNEL
@ -35,19 +35,19 @@
#error "cannot compile Schannel support without SSPI."
#endif
#include "schannel.h"
#include "schannel_int.h"
#include "vtls/schannel.h"
#include "vtls/schannel_int.h"
#include "../curlx/fopen.h"
#include "../curlx/inet_pton.h"
#include "vtls.h"
#include "vtls_int.h"
#include "../curl_trc.h"
#include "../strerror.h"
#include "../curlx/winapi.h"
#include "../curlx/multibyte.h"
#include "hostcheck.h"
#include "../curlx/version_win32.h"
#include "curlx/fopen.h"
#include "curlx/inet_pton.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "curl_trc.h"
#include "strerror.h"
#include "curlx/winapi.h"
#include "curlx/multibyte.h"
#include "vtls/hostcheck.h"
#include "curlx/version_win32.h"
#define BACKEND ((struct schannel_ssl_backend_data *)connssl->backend)

52
lib/vtls/vtls.c
View File

@ -38,40 +38,40 @@
https://httpd.apache.org/docs/2.0/ssl/ssl_intro.html
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include "../urldata.h"
#include "../cfilters.h"
#include "urldata.h"
#include "cfilters.h"
#include "vtls.h" /* generic SSL protos etc */
#include "vtls_int.h"
#include "vtls_scache.h"
#include "vtls/vtls.h" /* generic SSL protos etc */
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "openssl.h" /* OpenSSL versions */
#include "gtls.h" /* GnuTLS versions */
#include "wolfssl.h" /* wolfSSL versions */
#include "schannel.h" /* Schannel SSPI version */
#include "mbedtls.h" /* mbedTLS versions */
#include "rustls.h" /* Rustls versions */
#include "vtls/openssl.h" /* OpenSSL versions */
#include "vtls/gtls.h" /* GnuTLS versions */
#include "vtls/wolfssl.h" /* wolfSSL versions */
#include "vtls/schannel.h" /* Schannel SSPI version */
#include "vtls/mbedtls.h" /* mbedTLS versions */
#include "vtls/rustls.h" /* Rustls versions */
#include "../slist.h"
#include "../curl_trc.h"
#include "../strcase.h"
#include "../url.h"
#include "../progress.h"
#include "../curlx/fopen.h"
#include "../curl_sha256.h"
#include "../curlx/base64.h"
#include "../curlx/inet_pton.h"
#include "../connect.h"
#include "../select.h"
#include "../setopt.h"
#include "../curlx/strdup.h"
#include "../curlx/strcopy.h"
#include "slist.h"
#include "curl_trc.h"
#include "strcase.h"
#include "url.h"
#include "progress.h"
#include "curlx/fopen.h"
#include "curl_sha256.h"
#include "curlx/base64.h"
#include "curlx/inet_pton.h"
#include "connect.h"
#include "select.h"
#include "setopt.h"
#include "curlx/strdup.h"
#include "curlx/strcopy.h"
#ifdef USE_APPLE_SECTRUST
#include <Security/Security.h>

4
lib/vtls/vtls.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
struct connectdata;
struct ssl_config_data;
@ -49,7 +49,7 @@ struct dynbuf;
#define SSLSUPP_ISSUERCERT_BLOB (1 << 14) /* CURLOPT_ISSUERCERT_BLOB */
#ifdef USE_ECH
#include "../curlx/base64.h"
#include "curlx/base64.h"
#define ECH_ENABLED(__data__) \
(__data__->set.tls_ech && !(__data__->set.tls_ech & CURLECH_DISABLE))
#endif /* USE_ECH */

10
lib/vtls/vtls_int.h
View File

@ -23,14 +23,14 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SSL
#include "../cfilters.h"
#include "../select.h"
#include "../urldata.h"
#include "vtls.h"
#include "cfilters.h"
#include "select.h"
#include "urldata.h"
#include "vtls/vtls.h"
struct Curl_ssl;
struct ssl_connect_data;

28
lib/vtls/vtls_scache.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SSL
@ -29,21 +29,21 @@
#include <sys/types.h>
#endif
#include "../urldata.h"
#include "../cfilters.h"
#include "urldata.h"
#include "cfilters.h"
#include "vtls.h" /* generic SSL protos etc */
#include "vtls_int.h"
#include "vtls_scache.h"
#include "vtls_spack.h"
#include "vtls/vtls.h" /* generic SSL protos etc */
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "vtls/vtls_spack.h"
#include "../strcase.h"
#include "../url.h"
#include "../llist.h"
#include "../curl_share.h"
#include "../curl_trc.h"
#include "../curl_sha256.h"
#include "../rand.h"
#include "strcase.h"
#include "url.h"
#include "llist.h"
#include "curl_share.h"
#include "curl_trc.h"
#include "curl_sha256.h"
#include "rand.h"
/* a peer+tls-config we cache sessions for */

6
lib/vtls/vtls_scache.h
View File

@ -23,12 +23,12 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_SSL
#include "../cfilters.h"
#include "../urldata.h"
#include "cfilters.h"
#include "urldata.h"
struct Curl_cfilter;
struct Curl_easy;

12
lib/vtls/vtls_spack.c
View File

@ -21,15 +21,15 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_SSL) && defined(USE_SSLS_EXPORT)
#include "../urldata.h"
#include "../curl_trc.h"
#include "vtls_scache.h"
#include "vtls_spack.h"
#include "../curlx/strdup.h"
#include "urldata.h"
#include "curl_trc.h"
#include "vtls/vtls_scache.h"
#include "vtls/vtls_spack.h"
#include "curlx/strdup.h"
#ifndef UINT16_MAX
#define UINT16_MAX 0xffff

2
lib/vtls/vtls_spack.h
View File

@ -23,7 +23,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_SSL) && defined(USE_SSLS_EXPORT)

29
lib/vtls/wolfssl.c
View File

@ -26,7 +26,7 @@
* but vtls.c should ever call or use these functions.
*
*/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_WOLFSSL
@ -50,22 +50,23 @@
#endif
#endif
#include "../urldata.h"
#include "../curl_trc.h"
#include "../httpsrr.h"
#include "vtls.h"
#include "vtls_int.h"
#include "vtls_scache.h"
#include "keylog.h"
#include "../connect.h" /* for the connect timeout */
#include "../progress.h"
#include "../curlx/strdup.h"
#include "../curlx/strcopy.h"
#include "x509asn1.h"
#include "urldata.h"
#include "curl_trc.h"
#include "httpsrr.h"
#include "vtls/vtls.h"
#include "vtls/vtls_int.h"
#include "vtls/vtls_scache.h"
#include "vtls/keylog.h"
#include "connect.h" /* for the connect timeout */
#include "progress.h"
#include "curlx/strdup.h"
#include "curlx/strcopy.h"
#include "vtls/x509asn1.h"
#include <wolfssl/ssl.h>
#include <wolfssl/error-ssl.h>
#include "wolfssl.h"
#include "vtls/wolfssl.h"
/* KEEP_PEER_CERT is a product of the presence of build time symbol
OPENSSL_EXTRA without NO_CERTS, depending on the version. KEEP_PEER_CERT is

4
lib/vtls/wolfssl.h
View File

@ -23,11 +23,11 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#ifdef USE_WOLFSSL
#include "../urldata.h"
#include "urldata.h"
struct alpn_spec;
struct ssl_peer;

14
lib/vtls/x509asn1.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_GNUTLS) || defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || \
defined(USE_MBEDTLS) || defined(USE_RUSTLS)
@ -36,12 +36,12 @@
#define WANT_EXTRACT_CERTINFO /* uses Curl_extract_certinfo() */
#endif
#include "../urldata.h"
#include "vtls.h"
#include "../curl_trc.h"
#include "../curlx/base64.h"
#include "x509asn1.h"
#include "../curlx/dynbuf.h"
#include "urldata.h"
#include "vtls/vtls.h"
#include "curl_trc.h"
#include "curlx/base64.h"
#include "vtls/x509asn1.h"
#include "curlx/dynbuf.h"
/*
* Constants.

6
lib/vtls/x509asn1.h
View File

@ -24,13 +24,13 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "../curl_setup.h"
#include "curl_setup.h"
#if defined(USE_GNUTLS) || defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || \
defined(USE_MBEDTLS) || defined(USE_RUSTLS)
#include "../cfilters.h"
#include "../urldata.h"
#include "cfilters.h"
#include "urldata.h"
/*
* Types.

96
projects/Windows/tmpl/curl.vcxproj
View File

@ -839,7 +839,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -869,7 +869,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -898,7 +898,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -928,7 +928,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -956,7 +956,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -988,7 +988,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1019,7 +1019,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1051,7 +1051,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1082,7 +1082,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1114,7 +1114,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1145,7 +1145,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1176,7 +1176,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1208,7 +1208,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1240,7 +1240,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1272,7 +1272,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1302,7 +1302,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1331,7 +1331,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1360,7 +1360,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1390,7 +1390,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1420,7 +1420,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1448,7 +1448,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1480,7 +1480,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1512,7 +1512,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1542,7 +1542,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1570,7 +1570,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1602,7 +1602,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1634,7 +1634,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1664,7 +1664,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1692,7 +1692,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1724,7 +1724,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1756,7 +1756,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1786,7 +1786,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1814,7 +1814,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1846,7 +1846,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1878,7 +1878,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1908,7 +1908,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -1936,7 +1936,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -1968,7 +1968,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -2000,7 +2000,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -2030,7 +2030,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -2058,7 +2058,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -2089,7 +2089,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -2121,7 +2121,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -2153,7 +2153,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -2185,7 +2185,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -2214,7 +2214,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -2244,7 +2244,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -2274,7 +2274,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

2
src/toolx/tool_time.c
View File

@ -21,7 +21,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "tool_time.h"
#include "toolx/tool_time.h"
#if defined(__MINGW32__) && (__MINGW64_VERSION_MAJOR <= 3)
#include <sec_api/time_s.h> /* for _localtime32_s(), _localtime64_s() */