ntlm: Renamed handle variables to match other SSPI structures

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 accadaad49e91ece947f7ec0fd846879b78450be..b38670fdf68256d139d4c138e3d72492c352c0e4 100644 (file)
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -344,8 +344,8 @@ void Curl_ntlm_sspi_cleanup(struct ntlmdata *ntlm)
   Curl_safefree(ntlm->input_token);
 
   if(ntlm->has_handles) {
-    s_pSecFn->DeleteSecurityContext(&ntlm->c_handle);
-    s_pSecFn->FreeCredentialsHandle(&ntlm->handle);
+    s_pSecFn->DeleteSecurityContext(&ntlm->context);
+    s_pSecFn->FreeCredentialsHandle(&ntlm->credentials);
     ntlm->has_handles = 0;
   }
 
@@ -457,7 +457,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
                                               (TCHAR *) TEXT("NTLM"),
                                               SECPKG_CRED_OUTBOUND, NULL,
                                               ntlm->p_identity, NULL, NULL,
-                                              &ntlm->handle, &tsDummy);
+                                              &ntlm->credentials, &tsDummy);
   if(status != SEC_E_OK)
     return CURLE_OUT_OF_MEMORY;
 
@@ -470,18 +470,18 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
   type_1_buf.cbBuffer   = curlx_uztoul(ntlm->max_token_length);
 
   /* Generate our type-1 message */
-  status = s_pSecFn->InitializeSecurityContext(&ntlm->handle, NULL,
+  status = s_pSecFn->InitializeSecurityContext(&ntlm->credentials, NULL,
                                                (TCHAR *) TEXT(""),
                                                0, 0, SECURITY_NETWORK_DREP,
                                                NULL, 0,
-                                               &ntlm->c_handle, &type_1_desc,
+                                               &ntlm->context, &type_1_desc,
                                                &attrs, &tsDummy);
 
   if(status == SEC_I_COMPLETE_AND_CONTINUE ||
      status == SEC_I_CONTINUE_NEEDED)
-    s_pSecFn->CompleteAuthToken(&ntlm->c_handle, &type_1_desc);
+    s_pSecFn->CompleteAuthToken(&ntlm->context, &type_1_desc);
   else if(status != SEC_E_OK) {
-    s_pSecFn->FreeCredentialsHandle(&ntlm->handle);
+    s_pSecFn->FreeCredentialsHandle(&ntlm->credentials);
     return CURLE_RECV_ERROR;
   }
 
@@ -652,12 +652,12 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
   type_3_buf.cbBuffer   = curlx_uztoul(ntlm->max_token_length);
 
   /* Generate our type-3 message */
-  status = s_pSecFn->InitializeSecurityContext(&ntlm->handle,
-                                               &ntlm->c_handle,
+  status = s_pSecFn->InitializeSecurityContext(&ntlm->credentials,
+                                               &ntlm->context,
                                                (TCHAR *) TEXT(""),
                                                0, 0, SECURITY_NETWORK_DREP,
                                                &type_2_desc,
-                                               0, &ntlm->c_handle,
+                                               0, &ntlm->context,
                                                &type_3_desc,
                                                &attrs, &tsDummy);
   if(status != SEC_E_OK) {

diff --git a/lib/urldata.h b/lib/urldata.h
index bc68b5789050bfedb6a0f96b474f71eafc6e2934..5d1366737f250227d72307c5412bb838127885b3 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -435,8 +435,8 @@ struct kerberos5data {
 struct ntlmdata {
   curlntlm state;
 #ifdef USE_WINDOWS_SSPI
-  CredHandle handle;
-  CtxtHandle c_handle;
+  CredHandle credentials;
+  CtxtHandle context;
   SEC_WINNT_AUTH_IDENTITY identity;
   SEC_WINNT_AUTH_IDENTITY *p_identity;
   size_t max_token_length;