From 71ca932167085f313711d4259393c5f3441cc3a8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 5 Dec 2014 11:56:18 +0100 Subject: [PATCH 1/1] http: fix processing of digest auth parameters Signed-off-by: Felix Fietkau --- uclient-http.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/uclient-http.c b/uclient-http.c index 7c5bc63..c25e52f 100644 --- a/uclient-http.c +++ b/uclient-http.c @@ -319,6 +319,22 @@ static char *digest_unquote_sep(char **str) return start; } +static char *digest_sep(char **str) +{ + char *cur, *next; + + cur = *str; + next = strchr(*str, ','); + if (next) { + *str = next + 1; + *next = 0; + } else { + *str += strlen(*str); + } + + return cur; +} + static bool strmatch(char **str, const char *prefix) { int len = strlen(prefix); @@ -413,8 +429,9 @@ uclient_http_add_auth_digest(struct uclient_http *uh) next = buf; while (*next) { const char **dest = NULL; + const char *tmp; - while (isspace(*next)) + while (*next && isspace(*next)) next++; if (strmatch(&next, "realm")) @@ -425,8 +442,18 @@ uclient_http_add_auth_digest(struct uclient_http *uh) dest = &data.nonce; else if (strmatch(&next, "opaque")) dest = &opaque; - else - return; + else if (strmatch(&next, "stale") || + strmatch(&next, "algorithm") || + strmatch(&next, "auth-param")) { + digest_sep(&next); + continue; + } else if (strmatch(&next, "domain") || + strmatch(&next, "qop-options")) + dest = &tmp; + else { + digest_sep(&next); + continue; + } *dest = digest_unquote_sep(&next); } -- 2.11.0