libcurl: update to 8.3.0

6 files changed, 12 insertions, 23 deletions

diff --git a/libs/libcurl/src/vauth/cram.c b/libs/libcurl/src/vauth/cram.c
index 0ae4b882e1..c753cc3b51 100644
--- a/libs/libcurl/src/vauth/cram.c
+++ b/libs/libcurl/src/vauth/cram.c
@@ -26,7 +26,7 @@
 

 #include "curl_setup.h"

 

-#if !defined(CURL_DISABLE_CRYPTO_AUTH)

+#ifndef CURL_DISABLE_DIGEST_AUTH

 

 #include <curl/curl.h>

 #include "urldata.h"

@@ -94,4 +94,4 @@ CURLcode Curl_auth_create_cram_md5_message(const struct bufref *chlg,
   return CURLE_OK;

 }

 

-#endif /* !CURL_DISABLE_CRYPTO_AUTH */

+#endif /* !CURL_DISABLE_DIGEST_AUTH */

diff --git a/libs/libcurl/src/vauth/digest.c b/libs/libcurl/src/vauth/digest.c
index 770bac7682..e73302ff6a 100644
--- a/libs/libcurl/src/vauth/digest.c
+++ b/libs/libcurl/src/vauth/digest.c
@@ -27,7 +27,7 @@
 

 #include "curl_setup.h"

 

-#if !defined(CURL_DISABLE_CRYPTO_AUTH)

+#ifndef CURL_DISABLE_DIGEST_AUTH

 

 #include <curl/curl.h>

 

@@ -420,7 +420,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data,
     msnprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]);

 

   /* Generate our SPN */

-  spn = Curl_auth_build_spn(service, realm, NULL);

+  spn = Curl_auth_build_spn(service, data->conn->host.name, NULL);

   if(!spn)

     return CURLE_OUT_OF_MEMORY;

 

@@ -992,4 +992,4 @@ void Curl_auth_digest_cleanup(struct digestdata *digest)
 }

 #endif  /* !USE_WINDOWS_SSPI */

 

-#endif  /* CURL_DISABLE_CRYPTO_AUTH */

+#endif  /* !CURL_DISABLE_DIGEST_AUTH */

diff --git a/libs/libcurl/src/vauth/digest.h b/libs/libcurl/src/vauth/digest.h
index 17fea3fb4d..edbd0f99e2 100644
--- a/libs/libcurl/src/vauth/digest.h
+++ b/libs/libcurl/src/vauth/digest.h
@@ -26,7 +26,7 @@
 

 #include <curl/curl.h>

 

-#if !defined(CURL_DISABLE_CRYPTO_AUTH)

+#ifndef CURL_DISABLE_DIGEST_AUTH

 

 #define DIGEST_MAX_VALUE_LENGTH           256

 #define DIGEST_MAX_CONTENT_LENGTH         1024

diff --git a/libs/libcurl/src/vauth/digest_sspi.c b/libs/libcurl/src/vauth/digest_sspi.c
index 17832b0a59..996b83d50e 100644
--- a/libs/libcurl/src/vauth/digest_sspi.c
+++ b/libs/libcurl/src/vauth/digest_sspi.c
@@ -27,7 +27,7 @@
 

 #include "curl_setup.h"

 

-#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_CRYPTO_AUTH)

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

 

 #include <curl/curl.h>

 

@@ -665,4 +665,4 @@ void Curl_auth_digest_cleanup(struct digestdata *digest)
   Curl_safefree(digest->passwd);

 }

 

-#endif /* USE_WINDOWS_SSPI && !CURL_DISABLE_CRYPTO_AUTH */

+#endif /* USE_WINDOWS_SSPI && !CURL_DISABLE_DIGEST_AUTH */

diff --git a/libs/libcurl/src/vauth/ntlm.c b/libs/libcurl/src/vauth/ntlm.c
index d59d2df0ff..0cdf1a159f 100644
--- a/libs/libcurl/src/vauth/ntlm.c
+++ b/libs/libcurl/src/vauth/ntlm.c
@@ -45,12 +45,6 @@
 #include "rand.h"

 #include "vtls/vtls.h"

 

-/* SSL backend-specific #if branches in this file must be kept in the order

-   documented in curl_ntlm_core. */

-#if defined(NTLM_NEEDS_NSS_INIT)

-#include "vtls/nssg.h" /* for Curl_nss_force_init() */

-#endif

-

 #define BUILDING_CURL_NTLM_MSGS_C

 #include "vauth/vauth.h"

 #include "vauth/ntlm.h"

@@ -274,12 +268,7 @@ CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data,
   const unsigned char *type2 = Curl_bufref_ptr(type2ref);

   size_t type2len = Curl_bufref_len(type2ref);

 

-#if defined(NTLM_NEEDS_NSS_INIT)

-  /* Make sure the crypto backend is initialized */

-  result = Curl_nss_force_init(data);

-  if(result)

-    return result;

-#elif defined(CURL_DISABLE_VERBOSE_STRINGS)

+#if defined(CURL_DISABLE_VERBOSE_STRINGS)

   (void)data;

 #endif

 

diff --git a/libs/libcurl/src/vauth/vauth.h b/libs/libcurl/src/vauth/vauth.h
index 56a62574e5..5d5c2f4c9c 100644
--- a/libs/libcurl/src/vauth/vauth.h
+++ b/libs/libcurl/src/vauth/vauth.h
@@ -30,7 +30,7 @@
 

 struct Curl_easy;

 

-#if !defined(CURL_DISABLE_CRYPTO_AUTH)

+#if !defined(CURL_DISABLE_DIGEST_AUTH)

 struct digestdata;

 #endif

 

@@ -86,7 +86,7 @@ CURLcode Curl_auth_create_login_message(const char *value,
 CURLcode Curl_auth_create_external_message(const char *user,

                                            struct bufref *out);

 

-#if !defined(CURL_DISABLE_CRYPTO_AUTH)

+#ifndef CURL_DISABLE_DIGEST_AUTH

 /* This is used to generate a CRAM-MD5 response message */

 CURLcode Curl_auth_create_cram_md5_message(const struct bufref *chlg,

                                            const char *userp,

@@ -119,7 +119,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data,
 

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

 void Curl_auth_digest_cleanup(struct digestdata *digest);

-#endif /* !CURL_DISABLE_CRYPTO_AUTH */

+#endif /* !CURL_DISABLE_DIGEST_AUTH */

 

 #ifdef USE_GSASL

 /* This is used to evaluate if MECH is supported by gsasl */