[sr-dev] git:master: modules/auth: fixed checking and calculating of nonce count (nc ) value

Module: sip-router Branch: master Commit: 59cfef003b0314f802123c42238737c1b281b42e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59cfef0… Author: Juha Heinanen &lt;jh(a)tutpro.com&gt; Committer: Juha Heinanen &lt;jh(a)tutpro.com&gt; Date: Fri Mar 18 08:08:23 2011 +0200 modules/auth: fixed checking and calculating of nonce count (nc) value --- modules/auth/nonce.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/auth/nonce.c b/modules/auth/nonce.c index 1611876..467271b 100644 --- a/modules/auth/nonce.c +++ b/modules/auth/nonce.c @@ -278,6 +278,27 @@ int calc_nonce(char* nonce, int *nonce_len, int cfg, int since, int expires, +/** Utility to convert 8 hex digit string to int */ +static inline int l8hex2int(char* _s, unsigned int *_r) +{ + unsigned int i, res = 0; + + for(i = 0; i < 8; i++) { + res *= 16; + if ((_s[i] >= '0') && (_s[i] <= '9')) { + res += _s[i] - '0'; + } else if ((_s[i] >= 'a') && (_s[i] <= 'f')) { + res += _s[i] - 'a' + 10; + } else if ((_s[i] >= 'A') && (_s[i] <= 'F')) { + res += _s[i] - 'A' + 10; + } else return -1; + } + + *_r = res; + return 0; +} + + /** Check whether the nonce returned by UA is valid. * This function checks whether the nonce string returned by UA @@ -405,9 +426,11 @@ int check_nonce(auth_body_t* auth, str* secret1, str* secret2, /* if nounce-count checks enabled & auth. headers has nc */ if (nc_enabled && (pf & NF_VALID_NC_ID) && auth->digest.nc.s && auth->digest.nc.len){ - if (str2int(&auth->digest.nc, &nc)!=0){ - /* error, bad nc */ - return 5; /* invalid nc */ + if ((auth->digest.nc.len != 8) || + l8hex2int(auth->digest.nc.s, &nc) != 0) { + ERR("check_nonce: bad nc value %.*s\n", + auth->digest.nc.len, auth->digest.nc.s); + return 5; /* invalid nc */ } switch(nc_check_val(n_id, pf & NF_POOL_NO_MASK, nc)){ case NC_OK: