ntlm: Renamed SSPI based input token variables

Code cleanup to try and synchronise code between the different SSPI
based authentication mechanisms.

diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 9f215f295b464f9b026172b4421d45c101bd724f..accadaad49e91ece947f7ec0fd846879b78450be 100644 (file)
--- 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 900b8c8ad0eee58bc20d58686d653d9e94512ef9..bc68b5789050bfedb6a0f96b474f71eafc6e2934 100644 (file)
--- 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];