sspi: Renamed expiry time stamp 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 f0c502d2acd62ac7ed727443c65e441eea7a1b55..bb11259da1faa337dec6fa9973d85860d0542210 100644 (file)
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -423,7 +423,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
   SecBufferDesc type_1_desc;
   SECURITY_STATUS status;
   unsigned long attrs;
-  TimeStamp tsDummy; /* For Windows 9x compatibility of SSPI calls */
+  TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */
 
   Curl_ntlm_sspi_cleanup(ntlm);
 
@@ -470,7 +470,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
                                               (TCHAR *) TEXT("NTLM"),
                                               SECPKG_CRED_OUTBOUND, NULL,
                                               ntlm->p_identity, NULL, NULL,
-                                              ntlm->credentials, &tsDummy);
+                                              ntlm->credentials, &expiry);
   if(status != SEC_E_OK)
     return CURLE_OUT_OF_MEMORY;
 
@@ -495,7 +495,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
                                                0, 0, SECURITY_NETWORK_DREP,
                                                NULL, 0,
                                                ntlm->context, &type_1_desc,
-                                               &attrs, &tsDummy);
+                                               &attrs, &expiry);
 
   if(status == SEC_I_COMPLETE_NEEDED ||
      status == SEC_I_COMPLETE_AND_CONTINUE)
@@ -647,7 +647,7 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
   SecBufferDesc type_3_desc;
   SECURITY_STATUS status;
   unsigned long attrs;
-  TimeStamp tsDummy; /* For Windows 9x compatibility of SSPI calls */
+  TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */
 
   (void)passwdp;
   (void)userp;
@@ -676,7 +676,7 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
                                                &type_2_desc,
                                                0, ntlm->context,
                                                &type_3_desc,
-                                               &attrs, &tsDummy);
+                                               &attrs, &expiry);
   if(status != SEC_E_OK) {
     infof(data, "NTLM handshake failure (type-3 message): Status=%x\n",
           status);

diff --git a/lib/curl_sasl_sspi.c b/lib/curl_sasl_sspi.c
index cdd8b29cf9f7d11390f358ff0a8d4e4aea43f251..8192f0d6b35e4f6d2fa8b6fd9820d1846c599e01 100644 (file)
--- a/lib/curl_sasl_sspi.c
+++ b/lib/curl_sasl_sspi.c
@@ -134,7 +134,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
   SecBufferDesc resp_desc;
   SECURITY_STATUS status;
   unsigned long attrs;
-  TimeStamp tsDummy; /* For Windows 9x compatibility of SSPI calls */
+  TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */
 
   /* Decode the base-64 encoded challenge message */
   if(strlen(chlg64) && *chlg64 != '=') {
@@ -200,7 +200,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
                                               (TCHAR *) TEXT("WDigest"),
                                               SECPKG_CRED_OUTBOUND, NULL,
                                               &identity, NULL, NULL,
-                                              &handle, &tsDummy);
+                                              &handle, &expiry);
 
   if(status != SEC_E_OK) {
     Curl_sspi_free_identity(&identity);
@@ -230,7 +230,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
   /* Generate our challenge-response message */
   status = s_pSecFn->InitializeSecurityContext(&handle, NULL, spn, 0, 0, 0,
                                                &chlg_desc, 0, &ctx,
-                                               &resp_desc, &attrs, &tsDummy);
+                                               &resp_desc, &attrs, &expiry);
 
   if(status == SEC_I_COMPLETE_NEEDED ||
      status == SEC_I_COMPLETE_AND_CONTINUE)
@@ -313,7 +313,7 @@ CURLcode Curl_sasl_create_gssapi_user_message(struct SessionHandle *data,
   SecBufferDesc resp_desc;
   SECURITY_STATUS status;
   unsigned long attrs;
-  TimeStamp tsDummy; /* For Windows 9x compatibility of SSPI calls */
+  TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */
 
   if(!krb5->credentials) {
     /* Query the security package for Kerberos */
@@ -363,7 +363,7 @@ CURLcode Curl_sasl_create_gssapi_user_message(struct SessionHandle *data,
                                                 (TCHAR *) TEXT("Kerberos"),
                                                 SECPKG_CRED_OUTBOUND, NULL,
                                                 krb5->p_identity, NULL, NULL,
-                                                krb5->credentials, &tsDummy);
+                                                krb5->credentials, &expiry);
     if(status != SEC_E_OK)
       return CURLE_OUT_OF_MEMORY;
 
@@ -413,7 +413,7 @@ CURLcode Curl_sasl_create_gssapi_user_message(struct SessionHandle *data,
                                                chlg ? &chlg_desc : NULL, 0,
                                                &context,
                                                &resp_desc, &attrs,
-                                               &tsDummy);
+                                               &expiry);
 
   if(status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) {
     Curl_safefree(chlg);

diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c
index 61581f1f9a34a6d564eb9b5281f0d35f45aac1ee..c260bc345750171d9d3b9390d351f232de85cfde 100644 (file)
--- a/lib/http_negotiate_sspi.c
+++ b/lib/http_negotiate_sspi.c
@@ -53,7 +53,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
   SecBufferDesc     in_buff_desc;
   SecBuffer         in_sec_buff;
   unsigned long     context_attributes;
-  TimeStamp         lifetime;
+  TimeStamp         expiry;
   int ret;
   size_t len = 0, input_token_len = 0;
   CURLcode error;
@@ -158,7 +158,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
                                          (TCHAR *) TEXT("Negotiate"),
                                          SECPKG_CRED_OUTBOUND, NULL,
                                          neg_ctx->p_identity, NULL, NULL,
-                                         neg_ctx->credentials, &lifetime);
+                                         neg_ctx->credentials, &expiry);
     if(neg_ctx->status != SEC_E_OK)
       return -1;
   }
@@ -201,7 +201,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
     neg_ctx->context,
     &out_buff_desc,
     &context_attributes,
-    &lifetime);
+    &expiry);
 
   Curl_safefree(input_token);