generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sspi: Renamed expiry time stamp variables

Browse Source 
Code cleanup to try and synchronise code between the different SSPI
based authentication mechanisms.
This commit is contained in:
Steve Holme
2014-10-26 14:29:27 +00:00
parent 9c613ade7a
commit c2c6805797
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/curl_ntlm_msgs.c
View File

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

12
lib/curl_sasl_sspi.c
View File

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

6
lib/http_negotiate_sspi.c
View File

@@ -53,7 +53,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
SecBufferDesc in_buff_desc; SecBufferDesc in_buff_desc;
SecBuffer in_sec_buff; SecBuffer in_sec_buff;
unsigned long context_attributes; unsigned long context_attributes;
TimeStamp lifetime; TimeStamp expiry;
int ret; int ret;
size_t len = 0, input_token_len = 0; size_t len = 0, input_token_len = 0;
CURLcode error; CURLcode error;
@@ -158,7 +158,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
(TCHAR *) TEXT("Negotiate"), (TCHAR *) TEXT("Negotiate"),
SECPKG_CRED_OUTBOUND, NULL, SECPKG_CRED_OUTBOUND, NULL,
neg_ctx->p_identity, NULL, NULL, neg_ctx->p_identity, NULL, NULL,
neg_ctx->credentials, &lifetime); neg_ctx->credentials, &expiry);
if(neg_ctx->status != SEC_E_OK) if(neg_ctx->status != SEC_E_OK)
return -1; return -1;
} }
@@ -201,7 +201,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
neg_ctx->context, neg_ctx->context,
&out_buff_desc, &out_buff_desc,
&context_attributes, &context_attributes,
&lifetime); &expiry);
Curl_safefree(input_token); Curl_safefree(input_token);