moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-04 16:45:06 -05:00
Code Issues Releases Wiki Activity

negotiate sspi: fix sequential requests

Browse Source
This commit is contained in:
Marcel Roelofs 2011-05-16 11:19:03 +02:00 committed by Daniel Stenberg
parent 0c8e6f598a
commit 48a40f0402
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/http_negotiate_sspi.c
View File

@ -133,7 +133,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
(ret = get_gss_name(conn, proxy, neg_ctx->server_name))) (ret = get_gss_name(conn, proxy, neg_ctx->server_name)))
return ret; return ret;
if(!neg_ctx->max_token_length) { if(!neg_ctx->output_token) {
PSecPkgInfo SecurityPackage; PSecPkgInfo SecurityPackage;
ret = s_pSecFn->QuerySecurityPackageInfo((SEC_CHAR *)"Negotiate", ret = s_pSecFn->QuerySecurityPackageInfo((SEC_CHAR *)"Negotiate",
&SecurityPackage); &SecurityPackage);
@ -153,19 +153,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
header++; header++;
len = strlen(header); len = strlen(header);
if(len > 0) { if(!len) {
input_token = malloc(neg_ctx->max_token_length); /* first call in a new negotation, we have to acquire credentials,
if(!input_token)
return -1;
input_token_len = Curl_base64_decode(header,
(unsigned char **)&input_token);
if(input_token_len == 0)
return -1;
}
if(!input_token) {
/* first call in a new negotation, we have to require credentials,
and allocate memory for the context */ and allocate memory for the context */
neg_ctx->credentials = (CredHandle *)malloc(sizeof(CredHandle)); neg_ctx->credentials = (CredHandle *)malloc(sizeof(CredHandle));
@ -182,6 +171,16 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
if(neg_ctx->status != SEC_E_OK) if(neg_ctx->status != SEC_E_OK)
return -1; return -1;
} }
else {
input_token = malloc(neg_ctx->max_token_length);
if(!input_token)
return -1;
input_token_len = Curl_base64_decode(header,
(unsigned char **)&input_token);
if(input_token_len == 0)
return -1;
}
/* prepare the output buffers, and input buffers if present */ /* prepare the output buffers, and input buffers if present */
out_buff_desc.ulVersion = 0; out_buff_desc.ulVersion = 0;
@ -280,6 +279,8 @@ static void cleanup(struct negotiatedata *neg_ctx)
free(neg_ctx->output_token); free(neg_ctx->output_token);
neg_ctx->output_token = 0; neg_ctx->output_token = 0;
} }
neg_ctx->max_token_length = 0;
} }
void Curl_cleanup_negotiate(struct SessionHandle *data) void Curl_cleanup_negotiate(struct SessionHandle *data)