libcurl: update to 8.14.0

14 files changed, 158 insertions, 154 deletions

diff --git a/libs/libcurl/src/vauth/cleartext.c b/libs/libcurl/src/vauth/cleartext.c
index 93d6340bf2..5833316aaa 100644
--- a/libs/libcurl/src/vauth/cleartext.c
+++ b/libs/libcurl/src/vauth/cleartext.c
@@ -25,23 +25,23 @@
  *

  ***************************************************************************/

 

-#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 <curl/curl.h>

-#include "urldata.h"

+#include "../urldata.h"

 

-#include "vauth/vauth.h"

-#include "warnless.h"

-#include "sendf.h"

-#include "curl_printf.h"

+#include "vauth.h"

+#include "../curlx/warnless.h"

+#include "../sendf.h"

+#include "../curl_printf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

  * Curl_auth_create_plain_message()

diff --git a/libs/libcurl/src/vauth/cram.c b/libs/libcurl/src/vauth/cram.c
index 5457135d42..4dea9c48bc 100644
--- a/libs/libcurl/src/vauth/cram.c
+++ b/libs/libcurl/src/vauth/cram.c
@@ -24,22 +24,22 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #ifndef CURL_DISABLE_DIGEST_AUTH

 

 #include <curl/curl.h>

-#include "urldata.h"

+#include "../urldata.h"

 

-#include "vauth/vauth.h"

-#include "curl_hmac.h"

-#include "curl_md5.h"

-#include "warnless.h"

-#include "curl_printf.h"

+#include "vauth.h"

+#include "../curl_hmac.h"

+#include "../curl_md5.h"

+#include "../curlx/warnless.h"

+#include "../curl_printf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 

 /*

diff --git a/libs/libcurl/src/vauth/digest.c b/libs/libcurl/src/vauth/digest.c
index 98d0c04dca..d7d6562185 100644
--- a/libs/libcurl/src/vauth/digest.c
+++ b/libs/libcurl/src/vauth/digest.c
@@ -25,30 +25,30 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #ifndef CURL_DISABLE_DIGEST_AUTH

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "vauth/digest.h"

-#include "urldata.h"

-#include "curl_base64.h"

-#include "curl_hmac.h"

-#include "curl_md5.h"

-#include "curl_sha256.h"

-#include "curl_sha512_256.h"

-#include "vtls/vtls.h"

-#include "warnless.h"

-#include "strparse.h"

-#include "strcase.h"

-#include "curl_printf.h"

-#include "rand.h"

+#include "vauth.h"

+#include "digest.h"

+#include "../urldata.h"

+#include "../curlx/base64.h"

+#include "../curl_hmac.h"

+#include "../curl_md5.h"

+#include "../curl_sha256.h"

+#include "../curl_sha512_256.h"

+#include "../vtls/vtls.h"

+#include "../curlx/warnless.h"

+#include "../curlx/strparse.h"

+#include "../strcase.h"

+#include "../curl_printf.h"

+#include "../rand.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 #ifndef USE_WINDOWS_SSPI

 #define SESSION_ALGO 1 /* for algos with this bit set */

@@ -223,14 +223,14 @@ static CURLcode auth_digest_get_qop_values(const char *options, int *value)
   /* Initialise the output */

   *value = 0;

 

-  while(!Curl_str_until(&options, &out, 32, ',')) {

-    if(Curl_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH))

+  while(!curlx_str_until(&options, &out, 32, ',')) {

+    if(curlx_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH))

       *value |= DIGEST_QOP_VALUE_AUTH;

-    else if(Curl_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH_INT))

+    else if(curlx_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH_INT))

       *value |= DIGEST_QOP_VALUE_AUTH_INT;

-    else if(Curl_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH_CONF))

+    else if(curlx_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH_CONF))

       *value |= DIGEST_QOP_VALUE_AUTH_CONF;

-    if(Curl_str_single(&options, ','))

+    if(curlx_str_single(&options, ','))

       break;

   }

 

@@ -542,13 +542,13 @@ CURLcode Curl_auth_decode_digest_http_message(const char *chlg,
         /* Pass leading spaces */

         while(*token && ISBLANK(*token))

           token++;

-        while(!Curl_str_until(&token, &out, 32, ',')) {

-          if(Curl_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH))

+        while(!curlx_str_until(&token, &out, 32, ',')) {

+          if(curlx_str_casecompare(&out, DIGEST_QOP_VALUE_STRING_AUTH))

             foundAuth = TRUE;

-          else if(Curl_str_casecompare(&out,

+          else if(curlx_str_casecompare(&out,

                                        DIGEST_QOP_VALUE_STRING_AUTH_INT))

             foundAuthInt = TRUE;

-          if(Curl_str_single(&token, ','))

+          if(curlx_str_single(&token, ','))

             break;

           while(*token && ISBLANK(*token))

             token++;

@@ -699,8 +699,8 @@ static CURLcode auth_create_digest_http_message(
     if(result)

       return result;

 

-    result = Curl_base64_encode(cnoncebuf, sizeof(cnoncebuf),

-                                &cnonce, &cnonce_sz);

+    result = curlx_base64_encode(cnoncebuf, sizeof(cnoncebuf),

+                                 &cnonce, &cnonce_sz);

     if(result)

       return result;

 

diff --git a/libs/libcurl/src/vauth/digest_sspi.c b/libs/libcurl/src/vauth/digest_sspi.c
index 3210e8ad0e..9bf4c796c6 100644
--- a/libs/libcurl/src/vauth/digest_sspi.c
+++ b/libs/libcurl/src/vauth/digest_sspi.c
@@ -25,25 +25,25 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_DIGEST_AUTH)

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "vauth/digest.h"

-#include "urldata.h"

-#include "warnless.h"

-#include "curl_multibyte.h"

-#include "sendf.h"

-#include "strdup.h"

-#include "strcase.h"

-#include "strerror.h"

+#include "vauth.h"

+#include "digest.h"

+#include "../urldata.h"

+#include "../curlx/warnless.h"

+#include "../curlx/multibyte.h"

+#include "../sendf.h"

+#include "../strdup.h"

+#include "../strcase.h"

+#include "../strerror.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

 * Curl_auth_is_digest_supported()

diff --git a/libs/libcurl/src/vauth/gsasl.c b/libs/libcurl/src/vauth/gsasl.c
index d88f9ea77a..8897c84f92 100644
--- a/libs/libcurl/src/vauth/gsasl.c
+++ b/libs/libcurl/src/vauth/gsasl.c
@@ -24,22 +24,22 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #ifdef USE_GSASL

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "urldata.h"

-#include "sendf.h"

+#include "vauth.h"

+#include "../urldata.h"

+#include "../sendf.h"

 

 #include <gsasl.h>

 

 /* The last 3 #include files should be in this order */

-#include "curl_printf.h"

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_printf.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 bool Curl_auth_gsasl_is_supported(struct Curl_easy *data,

                                   const char *mech,

diff --git a/libs/libcurl/src/vauth/krb5_gssapi.c b/libs/libcurl/src/vauth/krb5_gssapi.c
index fde838b3ce..96d717fbaa 100644
--- a/libs/libcurl/src/vauth/krb5_gssapi.c
+++ b/libs/libcurl/src/vauth/krb5_gssapi.c
@@ -25,22 +25,22 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "curl_sasl.h"

-#include "urldata.h"

-#include "curl_gssapi.h"

-#include "sendf.h"

-#include "curl_printf.h"

+#include "vauth.h"

+#include "../curl_sasl.h"

+#include "../urldata.h"

+#include "../curl_gssapi.h"

+#include "../sendf.h"

+#include "../curl_printf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 #if defined(__GNUC__) && defined(__APPLE__)

 #pragma GCC diagnostic push

diff --git a/libs/libcurl/src/vauth/krb5_sspi.c b/libs/libcurl/src/vauth/krb5_sspi.c
index eadeb3d046..6cac791bdc 100644
--- a/libs/libcurl/src/vauth/krb5_sspi.c
+++ b/libs/libcurl/src/vauth/krb5_sspi.c
@@ -24,21 +24,21 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "urldata.h"

-#include "warnless.h"

-#include "curl_multibyte.h"

-#include "sendf.h"

+#include "vauth.h"

+#include "../urldata.h"

+#include "../curlx/warnless.h"

+#include "../curlx/multibyte.h"

+#include "../sendf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

  * Curl_auth_is_gssapi_supported()

diff --git a/libs/libcurl/src/vauth/ntlm.c b/libs/libcurl/src/vauth/ntlm.c
index e8230e6b83..1d474689d3 100644
--- a/libs/libcurl/src/vauth/ntlm.c
+++ b/libs/libcurl/src/vauth/ntlm.c
@@ -22,7 +22,7 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)

 

@@ -35,24 +35,24 @@
 

 #define DEBUG_ME 0

 

-#include "urldata.h"

-#include "sendf.h"

-#include "curl_ntlm_core.h"

-#include "curl_gethostname.h"

-#include "curl_multibyte.h"

-#include "curl_md5.h"

-#include "warnless.h"

-#include "rand.h"

-#include "vtls/vtls.h"

-#include "strdup.h"

-

-#include "vauth/vauth.h"

-#include "curl_endian.h"

-#include "curl_printf.h"

+#include "../urldata.h"

+#include "../sendf.h"

+#include "../curl_ntlm_core.h"

+#include "../curl_gethostname.h"

+#include "../curlx/multibyte.h"

+#include "../curl_md5.h"

+#include "../curlx/warnless.h"

+#include "../rand.h"

+#include "../vtls/vtls.h"

+#include "../strdup.h"

+

+#include "vauth.h"

+#include "../curl_endian.h"

+#include "../curl_printf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 

 /* NTLM buffer fixed size, large enough for long user + host + domain */

diff --git a/libs/libcurl/src/vauth/ntlm_sspi.c b/libs/libcurl/src/vauth/ntlm_sspi.c
index 3d8d1e010e..7922177158 100644
--- a/libs/libcurl/src/vauth/ntlm_sspi.c
+++ b/libs/libcurl/src/vauth/ntlm_sspi.c
@@ -22,23 +22,23 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM)

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "urldata.h"

-#include "curl_ntlm_core.h"

-#include "warnless.h"

-#include "curl_multibyte.h"

-#include "sendf.h"

-#include "strdup.h"

+#include "vauth.h"

+#include "../urldata.h"

+#include "../curl_ntlm_core.h"

+#include "../curlx/warnless.h"

+#include "../curlx/multibyte.h"

+#include "../sendf.h"

+#include "../strdup.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

  * Curl_auth_is_ntlm_supported()

diff --git a/libs/libcurl/src/vauth/oauth2.c b/libs/libcurl/src/vauth/oauth2.c
index 00bb9867ec..d8fb109386 100644
--- a/libs/libcurl/src/vauth/oauth2.c
+++ b/libs/libcurl/src/vauth/oauth2.c
@@ -24,22 +24,22 @@
  *

  ***************************************************************************/

 

-#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 <curl/curl.h>

-#include "urldata.h"

+#include "../urldata.h"

 

-#include "vauth/vauth.h"

-#include "warnless.h"

-#include "curl_printf.h"

+#include "vauth.h"

+#include "../curlx/warnless.h"

+#include "../curl_printf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

  * Curl_auth_create_oauth_bearer_message()

diff --git a/libs/libcurl/src/vauth/spnego_gssapi.c b/libs/libcurl/src/vauth/spnego_gssapi.c
index 7b7ec3ccfc..05169a81f8 100644
--- a/libs/libcurl/src/vauth/spnego_gssapi.c
+++ b/libs/libcurl/src/vauth/spnego_gssapi.c
@@ -24,23 +24,23 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO)

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "urldata.h"

-#include "curl_base64.h"

-#include "curl_gssapi.h"

-#include "warnless.h"

-#include "curl_multibyte.h"

-#include "sendf.h"

+#include "vauth.h"

+#include "../urldata.h"

+#include "../curlx/base64.h"

+#include "../curl_gssapi.h"

+#include "../curlx/warnless.h"

+#include "../curlx/multibyte.h"

+#include "../sendf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 #if defined(__GNUC__) && defined(__APPLE__)

 #pragma GCC diagnostic push

@@ -139,7 +139,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
   if(chlg64 && *chlg64) {

     /* Decode the base-64 encoded challenge message */

     if(*chlg64 != '=') {

-      result = Curl_base64_decode(chlg64, &chlg, &chlglen);

+      result = curlx_base64_decode(chlg64, &chlg, &chlglen);

       if(result)

         return result;

     }

@@ -156,10 +156,10 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
   }

 

   /* Set channel binding data if available */

-  if(Curl_dyn_len(&nego->channel_binding_data)) {

+  if(curlx_dyn_len(&nego->channel_binding_data)) {

     memset(&chan, 0, sizeof(struct gss_channel_bindings_struct));

-    chan.application_data.length = Curl_dyn_len(&nego->channel_binding_data);

-    chan.application_data.value = Curl_dyn_ptr(&nego->channel_binding_data);

+    chan.application_data.length = curlx_dyn_len(&nego->channel_binding_data);

+    chan.application_data.value = curlx_dyn_ptr(&nego->channel_binding_data);

     chan_bindings = &chan;

   }

 

@@ -228,9 +228,9 @@ CURLcode Curl_auth_create_spnego_message(struct negotiatedata *nego,
   OM_uint32 minor_status;

 

   /* Base64 encode the already generated response */

-  result = Curl_base64_encode(nego->output_token.value,

-                              nego->output_token.length,

-                              outptr, outlen);

+  result = curlx_base64_encode(nego->output_token.value,

+                               nego->output_token.length,

+                               outptr, outlen);

 

   if(result) {

     gss_release_buffer(&minor_status, &nego->output_token);

diff --git a/libs/libcurl/src/vauth/spnego_sspi.c b/libs/libcurl/src/vauth/spnego_sspi.c
index c42c7f8f10..dead8c4f36 100644
--- a/libs/libcurl/src/vauth/spnego_sspi.c
+++ b/libs/libcurl/src/vauth/spnego_sspi.c
@@ -24,23 +24,23 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO)

 

 #include <curl/curl.h>

 

-#include "vauth/vauth.h"

-#include "urldata.h"

-#include "curl_base64.h"

-#include "warnless.h"

-#include "curl_multibyte.h"

-#include "sendf.h"

-#include "strerror.h"

+#include "vauth.h"

+#include "../urldata.h"

+#include "../curlx/base64.h"

+#include "../curlx/warnless.h"

+#include "../curlx/multibyte.h"

+#include "../sendf.h"

+#include "../strerror.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

  * Curl_auth_is_spnego_supported()

@@ -186,7 +186,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
   if(chlg64 && *chlg64) {

     /* Decode the base-64 encoded challenge message */

     if(*chlg64 != '=') {

-      result = Curl_base64_decode(chlg64, &chlg, &chlglen);

+      result = curlx_base64_decode(chlg64, &chlg, &chlglen);

       if(result)

         return result;

     }

@@ -308,9 +308,9 @@ CURLcode Curl_auth_create_spnego_message(struct negotiatedata *nego,
                                          char **outptr, size_t *outlen)

 {

   /* Base64 encode the already generated response */

-  CURLcode result = Curl_base64_encode((const char *) nego->output_token,

-                                       nego->output_token_length, outptr,

-                                       outlen);

+  CURLcode result = curlx_base64_encode((const char *) nego->output_token,

+                                        nego->output_token_length, outptr,

+                                        outlen);

   if(!result && (!*outptr || !*outlen)) {

     free(*outptr);

     result = CURLE_REMOTE_ACCESS_DENIED;

diff --git a/libs/libcurl/src/vauth/vauth.c b/libs/libcurl/src/vauth/vauth.c
index d61669c2b8..b98197bbdb 100644
--- a/libs/libcurl/src/vauth/vauth.c
+++ b/libs/libcurl/src/vauth/vauth.c
@@ -22,19 +22,19 @@
  *

  ***************************************************************************/

 

-#include "curl_setup.h"

+#include "../curl_setup.h"

 

 #include <curl/curl.h>

 

 #include "vauth.h"

-#include "urldata.h"

-#include "strcase.h"

-#include "curl_multibyte.h"

-#include "curl_printf.h"

+#include "../urldata.h"

+#include "../strcase.h"

+#include "../curlx/multibyte.h"

+#include "../curl_printf.h"

 

 /* The last #include files should be: */

-#include "curl_memory.h"

-#include "memdebug.h"

+#include "../curl_memory.h"

+#include "../memdebug.h"

 

 /*

  * Curl_auth_build_spn()

diff --git a/libs/libcurl/src/vauth/vauth.h b/libs/libcurl/src/vauth/vauth.h
index fb43bc5e02..933bb4e737 100644
--- a/libs/libcurl/src/vauth/vauth.h
+++ b/libs/libcurl/src/vauth/vauth.h
@@ -26,7 +26,7 @@
 

 #include <curl/curl.h>

 

-#include "bufref.h"

+#include "../bufref.h"

 

 struct Curl_easy;

 

@@ -167,6 +167,8 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
 

 /* This is used to clean up the NTLM specific data */

 void Curl_auth_cleanup_ntlm(struct ntlmdata *ntlm);

+#else

+#define Curl_auth_is_ntlm_supported()     FALSE

 #endif /* USE_NTLM */

 

 /* This is used to generate a base64 encoded OAuth 2.0 message */

@@ -207,6 +209,8 @@ CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data,
 

 /* This is used to clean up the GSSAPI specific data */

 void Curl_auth_cleanup_gssapi(struct kerberos5data *krb5);

+#else

+#define Curl_auth_is_gssapi_supported()       FALSE

 #endif /* USE_KERBEROS5 */

 

 #if defined(USE_SPNEGO)