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

curl_sasl: Minor code policing following recent commits

Browse Source
This commit is contained in:
Steve Holme
2015-01-22 20:47:38 +00:00
parent 731e6a6662
commit c260c9fad3
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/curl_sasl.c
View File

@@ -54,7 +54,7 @@
/* Supported mechanisms */ /* Supported mechanisms */
const struct { const struct {
const char * name; /* Name */ const char *name; /* Name */
size_t len; /* Name length */ size_t len; /* Name length */
unsigned int bit; /* Flag bit */ unsigned int bit; /* Flag bit */
} mechtable[] = { } mechtable[] = {
@@ -92,7 +92,6 @@ const struct {
return result; \ return result; \
} }
/* /*
* Return 0 on success and then the buffers are filled in fine. * Return 0 on success and then the buffers are filled in fine.
* *
@@ -1212,8 +1211,7 @@ void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused)
* *
* Return the SASL mechanism token or 0 if no match. * Return the SASL mechanism token or 0 if no match.
*/ */
unsigned int unsigned int Curl_sasl_decode_mech(const char *ptr, size_t maxlen, size_t *len)
Curl_sasl_decode_mech(const char *ptr, size_t maxlen, size_t *len)
{ {
unsigned int i; unsigned int i;
char c; char c;
@@ -1223,8 +1221,10 @@ Curl_sasl_decode_mech(const char *ptr, size_t maxlen, size_t *len)
!memcmp(ptr, mechtable[i].name, mechtable[i].len)) { !memcmp(ptr, mechtable[i].name, mechtable[i].len)) {
if(len) if(len)
*len = mechtable[i].len; *len = mechtable[i].len;
if(maxlen == mechtable[i].len) if(maxlen == mechtable[i].len)
return mechtable[i].bit; return mechtable[i].bit;
c = ptr[mechtable[i].len]; c = ptr[mechtable[i].len];
if(!ISUPPER(c) && !ISDIGIT(c) && c != '-' && c != '_') if(!ISUPPER(c) && !ISDIGIT(c) && c != '-' && c != '_')
return mechtable[i].bit; return mechtable[i].bit;
@@ -1244,7 +1244,7 @@ CURLcode Curl_sasl_parse_url_auth_option(struct SASL *sasl,
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
unsigned int mechbit; unsigned int mechbit;
size_t llen; size_t mechlen;
if(!len) if(!len)
return CURLE_URL_MALFORMAT; return CURLE_URL_MALFORMAT;
@@ -1256,8 +1256,8 @@ CURLcode Curl_sasl_parse_url_auth_option(struct SASL *sasl,
if(strnequal(value, "*", len)) if(strnequal(value, "*", len))
sasl->prefmech = SASL_AUTH_ANY; sasl->prefmech = SASL_AUTH_ANY;
else if((mechbit = Curl_sasl_decode_mech(value, len, &llen)) && else if((mechbit = Curl_sasl_decode_mech(value, len, &mechlen)) &&
llen == len) mechlen == len)
sasl->prefmech |= mechbit; sasl->prefmech |= mechbit;
else else
result = CURLE_URL_MALFORMAT; result = CURLE_URL_MALFORMAT;
@@ -1434,6 +1434,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn,
} }
Curl_safefree(resp); Curl_safefree(resp);
return result; return result;
} }
@@ -1602,6 +1603,8 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn,
} }
Curl_safefree(resp); Curl_safefree(resp);
state(sasl, conn, newstate); state(sasl, conn, newstate);
return result; return result;
} }