Commit c2c68057 authored by Steve Holme's avatar Steve Holme
Browse files

sspi: Renamed expiry time stamp variables 

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

lib/curl_ntlm_msgs.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

lib/curl_sasl_sspi.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

lib/http_negotiate_sspi.c

+3 −3
Original line number Diff line number Diff line
@@ -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);