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

sspi: Renamed max token length 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:36:05 +00:00
parent c2c6805797
commit d91d21f05b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/curl_ntlm_msgs.c
View File

@@ -355,7 +355,7 @@ void Curl_ntlm_sspi_cleanup(struct ntlmdata *ntlm)
ntlm->credentials = NULL; ntlm->credentials = NULL;
} }
ntlm->max_token_length = 0; ntlm->token_max = 0;
Curl_safefree(ntlm->output_token); Curl_safefree(ntlm->output_token);
Curl_sspi_free_identity(ntlm->p_identity); Curl_sspi_free_identity(ntlm->p_identity);
@@ -433,13 +433,13 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
if(status != SEC_E_OK) if(status != SEC_E_OK)
return CURLE_NOT_BUILT_IN; return CURLE_NOT_BUILT_IN;
ntlm->max_token_length = SecurityPackage->cbMaxToken; ntlm->token_max = SecurityPackage->cbMaxToken;
/* Release the package buffer as it is not required anymore */ /* Release the package buffer as it is not required anymore */
s_pSecFn->FreeContextBuffer(SecurityPackage); s_pSecFn->FreeContextBuffer(SecurityPackage);
/* Allocate our output buffer */ /* Allocate our output buffer */
ntlm->output_token = malloc(ntlm->max_token_length); ntlm->output_token = malloc(ntlm->token_max);
if(!ntlm->output_token) if(!ntlm->output_token)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@@ -487,7 +487,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp,
type_1_desc.pBuffers = &type_1_buf; type_1_desc.pBuffers = &type_1_buf;
type_1_buf.BufferType = SECBUFFER_TOKEN; type_1_buf.BufferType = SECBUFFER_TOKEN;
type_1_buf.pvBuffer = ntlm->output_token; type_1_buf.pvBuffer = ntlm->output_token;
type_1_buf.cbBuffer = curlx_uztoul(ntlm->max_token_length); type_1_buf.cbBuffer = curlx_uztoul(ntlm->token_max);
/* Generate our type-1 message */ /* Generate our type-1 message */
status = s_pSecFn->InitializeSecurityContext(ntlm->credentials, NULL, status = s_pSecFn->InitializeSecurityContext(ntlm->credentials, NULL,
@@ -666,7 +666,7 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
type_3_desc.pBuffers = &type_3_buf; type_3_desc.pBuffers = &type_3_buf;
type_3_buf.BufferType = SECBUFFER_TOKEN; type_3_buf.BufferType = SECBUFFER_TOKEN;
type_3_buf.pvBuffer = ntlm->output_token; type_3_buf.pvBuffer = ntlm->output_token;
type_3_buf.cbBuffer = curlx_uztoul(ntlm->max_token_length); type_3_buf.cbBuffer = curlx_uztoul(ntlm->token_max);
/* Generate our type-3 message */ /* Generate our type-3 message */
status = s_pSecFn->InitializeSecurityContext(ntlm->credentials, status = s_pSecFn->InitializeSecurityContext(ntlm->credentials,

8
lib/http_negotiate_sspi.c
View File

@@ -113,8 +113,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
/* Allocate input and output buffers according to the max token size /* Allocate input and output buffers according to the max token size
as indicated by the security package */ as indicated by the security package */
neg_ctx->max_token_length = SecurityPackage->cbMaxToken; neg_ctx->token_max = SecurityPackage->cbMaxToken;
neg_ctx->output_token = malloc(neg_ctx->max_token_length); neg_ctx->output_token = malloc(neg_ctx->token_max);
s_pSecFn->FreeContextBuffer(SecurityPackage); s_pSecFn->FreeContextBuffer(SecurityPackage);
} }
@@ -176,7 +176,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
out_buff_desc.pBuffers = &out_sec_buff; out_buff_desc.pBuffers = &out_sec_buff;
out_sec_buff.BufferType = SECBUFFER_TOKEN; out_sec_buff.BufferType = SECBUFFER_TOKEN;
out_sec_buff.pvBuffer = neg_ctx->output_token; out_sec_buff.pvBuffer = neg_ctx->output_token;
out_sec_buff.cbBuffer = curlx_uztoul(neg_ctx->max_token_length); out_sec_buff.cbBuffer = curlx_uztoul(neg_ctx->token_max);
/* Setup the "input" security buffer if present */ /* Setup the "input" security buffer if present */
if(input_token) { if(input_token) {
@@ -270,7 +270,7 @@ static void cleanup(struct negotiatedata *neg_ctx)
neg_ctx->credentials = NULL; neg_ctx->credentials = NULL;
} }
neg_ctx->max_token_length = 0; neg_ctx->token_max = 0;
Curl_safefree(neg_ctx->output_token); Curl_safefree(neg_ctx->output_token);
Curl_safefree(neg_ctx->server_name); Curl_safefree(neg_ctx->server_name);

6
lib/urldata.h
View File

@@ -440,7 +440,7 @@ struct ntlmdata {
CtxtHandle *context; CtxtHandle *context;
SEC_WINNT_AUTH_IDENTITY identity; SEC_WINNT_AUTH_IDENTITY identity;
SEC_WINNT_AUTH_IDENTITY *p_identity; SEC_WINNT_AUTH_IDENTITY *p_identity;
size_t max_token_length; size_t token_max;
BYTE *output_token; BYTE *output_token;
BYTE *input_token; BYTE *input_token;
size_t input_token_len; size_t input_token_len;
@@ -466,12 +466,12 @@ struct negotiatedata {
#else #else
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI
DWORD status; DWORD status;
CtxtHandle *context;
CredHandle *credentials; CredHandle *credentials;
CtxtHandle *context;
SEC_WINNT_AUTH_IDENTITY identity; SEC_WINNT_AUTH_IDENTITY identity;
SEC_WINNT_AUTH_IDENTITY *p_identity; SEC_WINNT_AUTH_IDENTITY *p_identity;
TCHAR *server_name; TCHAR *server_name;
size_t max_token_length; size_t token_max;
BYTE *output_token; BYTE *output_token;
size_t output_token_length; size_t output_token_length;
#endif #endif