diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-01-26 14:04:46 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-01-29 20:24:16 +0000 |
| commit | 914b60c8277c2e8dde17e30376f9c173ddf94619 (patch) | |
| tree | a06d3fe9a4d9df7b3481fdaf65b414bcef720645 /lib | |
| parent | 07b66cbfa4d25e7ec0366418b131c9a51c7ada0f (diff) | |
ntlm: Updated Curl_ntlm_core_mk_ntlmv2_resp() to use local variables
...until the function is successful when it returns them in the out
parameters.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/curl_ntlm_core.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index 17dc445c9..fda30b581 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -547,6 +547,7 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, ------------------------------------------------------------------------------ */ + unsigned int len = 0; unsigned char *ptr = NULL; unsigned char hmac_output[NTLM_HMAC_MD5_LEN]; long long tw; @@ -556,15 +557,14 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, tw = ((long long)time(NULL) + 11644473600ULL) * 10000000ULL; /* Calculate the response len */ - *ntresp_len = NTLM_HMAC_MD5_LEN + NTLMv2_BLOB_LEN; + len = NTLM_HMAC_MD5_LEN + NTLMv2_BLOB_LEN; /* Allocate the response */ - *ntresp = malloc(*ntresp_len); - if(!*ntresp) + ptr = malloc(len); + if(!ptr) return CURLE_OUT_OF_MEMORY; - ptr = *ntresp; - memset(ptr, 0, *ntresp_len); + memset(ptr, 0, len); /* Create the BLOB structure */ snprintf((char *)ptr + NTLM_HMAC_MD5_LEN, NTLMv2_BLOB_LEN, @@ -581,14 +581,17 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, res = Curl_hmac_md5(ntlmv2hash, NTLM_HMAC_MD5_LEN, ptr + 8, NTLMv2_BLOB_LEN + 8, hmac_output); if(res) { - Curl_safefree(*ntresp); - *ntresp_len = 0; + Curl_safefree(ptr); return res; } /* Concatenate the HMAC MD5 output with the BLOB */ memcpy(ptr, hmac_output, NTLM_HMAC_MD5_LEN); + /* Return the response */ + *ntresp = ptr; + *ntresp_len = len; + return res; } |