curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-18 18:12:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

schannel: fix compiler warnings

Browse Source 
Closes #2296
This commit is contained in:
Michael Kaufmann 2018-02-07 21:39:26 +01:00
parent 0fd6221f8c
commit a64b002e3a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/vtls/schannel.c
View File

@ -1696,7 +1696,7 @@ static CURLcode pkp_pin_peer_pubkey(struct connectdata *conn, int sockindex,
struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_connect_data *connssl = &conn->ssl[sockindex];
CERT_CONTEXT *pCertContextServer = NULL; CERT_CONTEXT *pCertContextServer = NULL;
const char *x509_der; const char *x509_der;
int x509_der_len; DWORD x509_der_len;
curl_X509certificate x509_parsed; curl_X509certificate x509_parsed;
curl_asn1Element *pubkey; curl_asn1Element *pubkey;
@ -1723,7 +1723,7 @@ static CURLcode pkp_pin_peer_pubkey(struct connectdata *conn, int sockindex,
(pCertContextServer->cbCertEncoded > 0))) (pCertContextServer->cbCertEncoded > 0)))
break; break;
x509_der = pCertContextServer->pbCertEncoded; x509_der = (const char *)pCertContextServer->pbCertEncoded;
x509_der_len = pCertContextServer->cbCertEncoded; x509_der_len = pCertContextServer->cbCertEncoded;
memset(&x509_parsed, 0, sizeof x509_parsed); memset(&x509_parsed, 0, sizeof x509_parsed);
if(Curl_parseX509(&x509_parsed, x509_der, x509_der + x509_der_len)) if(Curl_parseX509(&x509_parsed, x509_der, x509_der + x509_der_len))
@ -1894,19 +1894,21 @@ static void Curl_schannel_checksum(const unsigned char *input,
size_t inputlen, size_t inputlen,
unsigned char *checksum, unsigned char *checksum,
size_t checksumlen, size_t checksumlen,
const unsigned char *pszProvider, DWORD provType,
const unsigned int algId) const unsigned int algId)
{ {
HCRYPTPROV hProv = 0; HCRYPTPROV hProv = 0;
HCRYPTHASH hHash = 0; HCRYPTHASH hHash = 0;
size_t cbHashSize = 0, dwCount = sizeof(size_t); DWORD cbHashSize = 0;
DWORD dwHashSizeLen = (DWORD)sizeof(cbHashSize);
DWORD dwChecksumLen = (DWORD)checksumlen;
/* since this can fail in multiple ways, zero memory first so we never /* since this can fail in multiple ways, zero memory first so we never
* return old data * return old data
*/ */
memset(checksum, 0, checksumlen); memset(checksum, 0, checksumlen);
if(!CryptAcquireContext(&hProv, NULL, NULL, pszProvider, if(!CryptAcquireContext(&hProv, NULL, NULL, provType,
CRYPT_VERIFYCONTEXT)) CRYPT_VERIFYCONTEXT))
return; /* failed */ return; /* failed */
@ -1914,19 +1916,19 @@ static void Curl_schannel_checksum(const unsigned char *input,
if(!CryptCreateHash(hProv, algId, 0, 0, &hHash)) if(!CryptCreateHash(hProv, algId, 0, 0, &hHash))
break; /* failed */ break; /* failed */
if(!CryptHashData(hHash, (const BYTE*) input, inputlen, 0)) if(!CryptHashData(hHash, (const BYTE*)input, (DWORD)inputlen, 0))
break; /* failed */ break; /* failed */
/* get hash size */ /* get hash size */
if(!CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&cbHashSize, if(!CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&cbHashSize,
&dwCount, 0)) &dwHashSizeLen, 0))
break; /* failed */ break; /* failed */
/* check hash size */ /* check hash size */
if(checksumlen < cbHashSize) if(checksumlen < cbHashSize)
break; /* failed */ break; /* failed */
if(CryptGetHashParam(hHash, HP_HASHVAL, checksum, &checksumlen, 0)) if(CryptGetHashParam(hHash, HP_HASHVAL, checksum, &dwChecksumLen, 0))
break; /* failed */ break; /* failed */
} while(0); } while(0);
@ -1937,16 +1939,17 @@ static void Curl_schannel_checksum(const unsigned char *input,
CryptReleaseContext(hProv, 0); CryptReleaseContext(hProv, 0);
} }
void Curl_schannel_md5sum(unsigned char *input, CURLcode Curl_schannel_md5sum(unsigned char *input,
size_t inputlen, size_t inputlen,
unsigned char *md5sum, unsigned char *md5sum,
size_t md5len) size_t md5len)
{ {
Curl_schannel_checksum(input, inputlen, md5sum, md5len, Curl_schannel_checksum(input, inputlen, md5sum, md5len,
PROV_RSA_FULL, CALG_MD5); PROV_RSA_FULL, CALG_MD5);
return CURLE_OK;
} }
void Curl_schannel_sha256sum(unsigned char *input, void Curl_schannel_sha256sum(const unsigned char *input,
size_t inputlen, size_t inputlen,
unsigned char *sha256sum, unsigned char *sha256sum,
size_t sha256len) size_t sha256len)