moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

http_digest: Post SSPI support tidy up

Browse Source 
Post tidy up to ensure commonality of code style and variable names.
This commit is contained in:
Steve Holme 2014-11-06 23:01:36 +00:00
parent e2828af607
commit 70100d5509
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/curl_sasl.c
View File

@ -96,7 +96,7 @@ static int sasl_digest_get_pair(const char *str, char *value, char *content,
for(c = DIGEST_MAX_VALUE_LENGTH - 1; (*str && (*str != '=') && c--); )
*value++ = *str++;
*value=0;
*value = 0;
if('=' != *str++)
/* eek, no match */
@ -123,19 +123,19 @@ static int sasl_digest_get_pair(const char *str, char *value, char *content,
if(!starts_with_quote) {
/* this signals the end of the content if we didn't get a starting
quote and then we do "sloppy" parsing */
c=0; /* the end */
c = 0; /* the end */
continue;
}
break;
case '\r':
case '\n':
/* end of string */
c=0;
c = 0;
continue;
case '\"':
if(!escape && starts_with_quote) {
/* end of string */
c=0;
c = 0;
continue;
}
break;
@ -143,7 +143,7 @@ static int sasl_digest_get_pair(const char *str, char *value, char *content,
escape = FALSE;
*content++ = *str;
}
*content=0;
*content = 0;
*endptr = str;
@ -787,7 +787,7 @@ CURLcode Curl_sasl_decode_digest_http_message(const char *chlg,
free(tmp);
/* Select only auth o auth-int. Otherwise, ignore */
/* Select only auth or auth-int. Otherwise, ignore */
if(foundAuth) {
digest->qop = strdup(DIGEST_QOP_VALUE_STRING_AUTH);
if(!digest->qop)

30
lib/http_digest.c
View File

@ -48,14 +48,16 @@ CURLcode Curl_input_digest(struct connectdata *conn,
const char *header) /* rest of the *-authenticate:
header */
{
struct SessionHandle *data=conn->data;
struct digestdata *d;
struct SessionHandle *data = conn->data;
/* Point to the correct struct with this */
struct digestdata *digest;
if(proxy) {
d = &data->state.proxydigest;
digest = &data->state.proxydigest;
}
else {
d = &data->state.digest;
digest = &data->state.digest;
}
if(!checkprefix("Digest", header))
@ -65,7 +67,7 @@ CURLcode Curl_input_digest(struct connectdata *conn,
while(*header && ISSPACE(*header))
header++;
return Curl_sasl_decode_digest_http_message(header, d);
return Curl_sasl_decode_digest_http_message(header, digest);
}
CURLcode Curl_output_digest(struct connectdata *conn,
@ -90,18 +92,18 @@ CURLcode Curl_output_digest(struct connectdata *conn,
const char *passwdp;
/* Point to the correct struct with this */
struct digestdata *d;
struct digestdata *digest;
struct auth *authp;
if(proxy) {
d = &data->state.proxydigest;
digest = &data->state.proxydigest;
allocuserpwd = &conn->allocptr.proxyuserpwd;
userp = conn->proxyuser;
passwdp = conn->proxypasswd;
authp = &data->state.authproxy;
}
else {
d = &data->state.digest;
digest = &data->state.digest;
allocuserpwd = &conn->allocptr.userpwd;
userp = conn->user;
passwdp = conn->passwd;
@ -112,15 +114,15 @@ CURLcode Curl_output_digest(struct connectdata *conn,
/* not set means empty */
if(!userp)
userp="";
userp = "";
if(!passwdp)
passwdp="";
passwdp = "";
#if defined(USE_WINDOWS_SSPI)
have_chlg = d->input_token ? TRUE : FALSE;
have_chlg = digest->input_token ? TRUE : FALSE;
#else
have_chlg = d->nonce ? TRUE : FALSE;
have_chlg = digest->nonce ? TRUE : FALSE;
#endif
if(!have_chlg) {
@ -147,13 +149,13 @@ CURLcode Curl_output_digest(struct connectdata *conn,
path = (unsigned char *) aprintf("%.*s", urilen, uripath);
}
else
path = (unsigned char *) strdup((char *)uripath);
path = (unsigned char *) strdup((char *) uripath);
if(!path)
return CURLE_OUT_OF_MEMORY;
result = Curl_sasl_create_digest_http_message(data, userp, passwdp, request,
path, d, &response, &len);
path, digest, &response, &len);
free(path);
if(result)
return result;