From: Steve Holme <steve_holme@hotmail.com>
Date: Wed, 24 Dec 2014 22:22:07 +0000 (+0000)
Subject: curl_ntlm_core.c: Fixed compilation warnings
X-Git-Tag: curl-7_40_0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed16a1695f40e6b3dee6c7cf091eecb8839f88b9;p=thirdparty%2Fcurl.git

curl_ntlm_core.c: Fixed compilation warnings

curl_ntlm_core.c:301: warning: pointer targets in passing argument 2 of
                      'CryptImportKey' differ in signedness
curl_ntlm_core.c:310: warning: passing argument 6 of 'CryptEncrypt' from
                      incompatible pointer type
curl_ntlm_core.c:540: warning: passing argument 4 of 'CryptGetHashParam'
                      from incompatible pointer type
---

diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index 83ca560480..778f729a42 100644
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -283,7 +283,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
     unsigned int len;
     char key[8];
   } blob;
-  unsigned int len = 8;
+  DWORD len = 8;
 
   /* Acquire the crypto provider */
   if(!CryptAcquireContext(&hprov, NULL, NULL, PROV_RSA_FULL,
@@ -298,7 +298,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
   blob.len = sizeof(blob.key);
 
   /* Import the key */
-  if(!CryptImportKey(hprov, (char *) &blob, sizeof(blob), 0, 0, &hkey)) {
+  if(!CryptImportKey(hprov, (BYTE *) &blob, sizeof(blob), 0, 0, &hkey)) {
     CryptReleaseContext(hprov, 0);
 
     return FALSE;
@@ -535,7 +535,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct SessionHandle *data,
                            CRYPT_VERIFYCONTEXT)) {
       HCRYPTHASH hhash;
       if(CryptCreateHash(hprov, CALG_MD4, 0, 0, &hhash)) {
-        unsigned int length = 16;
+        DWORD length = 16;
         CryptHashData(hhash, pw, (unsigned int)len * 2, 0);
         CryptGetHashParam(hhash, HP_HASHVAL, ntbuffer, &length, 0);
         CryptDestroyHash(hhash);