libcurl: update to 8.13.0

1 files changed, 15 insertions, 24 deletions

diff --git a/libs/libcurl/src/curl_ntlm_core.c b/libs/libcurl/src/curl_ntlm_core.c
index 944bfa2c09..b574a1b612 100644
--- a/libs/libcurl/src/curl_ntlm_core.c
+++ b/libs/libcurl/src/curl_ntlm_core.c
@@ -71,16 +71,7 @@
 #  include <openssl/md5.h>

 #  include <openssl/ssl.h>

 #  include <openssl/rand.h>

-#  if (defined(OPENSSL_VERSION_NUMBER) && \

-       (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL)

-#    define DES_key_schedule des_key_schedule

-#    define DES_cblock des_cblock

-#    define DES_set_odd_parity des_set_odd_parity

-#    define DES_set_key des_set_key

-#    define DES_ecb_encrypt des_ecb_encrypt

-#    define DESKEY(x) x

-#    define DESKEYARG(x) x

-#  elif defined(OPENSSL_IS_AWSLC)

+#  if defined(OPENSSL_IS_AWSLC)

 #    define DES_set_key_unchecked (void)DES_set_key

 #    define DESKEYARG(x) *x

 #    define DESKEY(x) &x

@@ -144,9 +135,6 @@
 #include "curl_memory.h"

 #include "memdebug.h"

 

-#define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00"

-#define NTLMv2_BLOB_LEN       (44 -16 + ntlm->target_info_len + 4)

-

 #if !defined(CURL_NTLM_NOT_SUPPORTED)

 /*

 * Turns a 56-bit key into being 64-bit wide.

@@ -333,16 +321,16 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys,
   DES_key_schedule ks;

 

   setup_des_key(keys, DESKEY(ks));

-  DES_ecb_encrypt((DES_cblock*) plaintext, (DES_cblock*) results,

-                  DESKEY(ks), DES_ENCRYPT);

+  DES_ecb_encrypt((DES_cblock*)CURL_UNCONST(plaintext),

+                  (DES_cblock*)results, DESKEY(ks), DES_ENCRYPT);

 

   setup_des_key(keys + 7, DESKEY(ks));

-  DES_ecb_encrypt((DES_cblock*) plaintext, (DES_cblock*) (results + 8),

-                  DESKEY(ks), DES_ENCRYPT);

+  DES_ecb_encrypt((DES_cblock*)CURL_UNCONST(plaintext),

+                  (DES_cblock*)(results + 8), DESKEY(ks), DES_ENCRYPT);

 

   setup_des_key(keys + 14, DESKEY(ks));

-  DES_ecb_encrypt((DES_cblock*) plaintext, (DES_cblock*) (results + 16),

-                  DESKEY(ks), DES_ENCRYPT);

+  DES_ecb_encrypt((DES_cblock*)CURL_UNCONST(plaintext),

+                  (DES_cblock*)(results + 16), DESKEY(ks), DES_ENCRYPT);

 #elif defined(USE_GNUTLS)

   struct des_ctx des;

   setup_des_key(keys, &des);

@@ -387,12 +375,12 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password,
     DES_key_schedule ks;

 

     setup_des_key(pw, DESKEY(ks));

-    DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)lmbuffer,

-                    DESKEY(ks), DES_ENCRYPT);

+    DES_ecb_encrypt((DES_cblock *)CURL_UNCONST(magic),

+                    (DES_cblock *)lmbuffer, DESKEY(ks), DES_ENCRYPT);

 

     setup_des_key(pw + 7, DESKEY(ks));

-    DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)(lmbuffer + 8),

-                    DESKEY(ks), DES_ENCRYPT);

+    DES_ecb_encrypt((DES_cblock *)CURL_UNCONST(magic),

+                    (DES_cblock *)(lmbuffer + 8), DESKEY(ks), DES_ENCRYPT);

 #elif defined(USE_GNUTLS)

     struct des_ctx des;

     setup_des_key(pw, &des);

@@ -465,6 +453,9 @@ CURLcode Curl_ntlm_core_mk_nt_hash(const char *password,
 

 #if !defined(USE_WINDOWS_SSPI)

 

+#define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00"

+#define NTLMv2_BLOB_LEN       (44 -16 + ntlm->target_info_len + 4)

+

 /* Timestamp in tenths of a microsecond since January 1, 1601 00:00:00 UTC. */

 struct ms_filetime {

   unsigned int dwLowDateTime;

@@ -626,7 +617,7 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
   /* Concatenate the Type 2 challenge with the BLOB and do HMAC MD5 */

   memcpy(ptr + 8, &ntlm->nonce[0], 8);

   result = Curl_hmacit(&Curl_HMAC_MD5, ntlmv2hash, HMAC_MD5_LENGTH, ptr + 8,

-                    NTLMv2_BLOB_LEN + 8, hmac_output);

+                       NTLMv2_BLOB_LEN + 8, hmac_output);

   if(result) {

     free(ptr);

     return result;