diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-10-25 14:12:41 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-10-25 14:15:48 +0100 |
| commit | df97ab3e5f89926d8c2c7c2184e9cb65256734d3 (patch) | |
| tree | 78ef02aa111e4904b151eba0a9912bcc8df4f338 /lib | |
| parent | c18329cef696e754750aea8c3fae4c12275ccb8f (diff) | |
ntlm: Renamed SSPI based input token variables
Code cleanup to try and synchronise code between the different SSPI
based authentication mechanisms.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/curl_ntlm_msgs.c | 10 | ||||
| -rw-r--r-- | lib/urldata.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index 9f215f295..accadaad4 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -297,8 +297,8 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data, } #ifdef USE_WINDOWS_SSPI - ntlm->type_2 = buffer; - ntlm->n_type_2 = curlx_uztoul(size); + ntlm->input_token = buffer; + ntlm->input_token_len = size; #else ntlm->flags = 0; @@ -341,7 +341,7 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data, #ifdef USE_WINDOWS_SSPI void Curl_ntlm_sspi_cleanup(struct ntlmdata *ntlm) { - Curl_safefree(ntlm->type_2); + Curl_safefree(ntlm->input_token); if(ntlm->has_handles) { s_pSecFn->DeleteSecurityContext(&ntlm->c_handle); @@ -640,8 +640,8 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data, type_2_desc.cBuffers = 1; type_2_desc.pBuffers = &type_2_buf; type_2_buf.BufferType = SECBUFFER_TOKEN; - type_2_buf.pvBuffer = ntlm->type_2; - type_2_buf.cbBuffer = ntlm->n_type_2; + type_2_buf.pvBuffer = ntlm->input_token; + type_2_buf.cbBuffer = curlx_uztoul(ntlm->input_token_len); /* Setup the type-3 "output" security buffer */ type_3_desc.ulVersion = SECBUFFER_VERSION; diff --git a/lib/urldata.h b/lib/urldata.h index 900b8c8ad..bc68b5789 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -442,8 +442,8 @@ struct ntlmdata { size_t max_token_length; BYTE *output_token; int has_handles; - BYTE *type_2; - unsigned long n_type_2; + BYTE *input_token; + size_t input_token_len; #else unsigned int flags; unsigned char nonce[8]; |