Merge branch 'bug6861_typofix'

This commit is contained in:
Nick Mathewson 2012-09-17 10:28:35 -04:00
commit 5511d21d2b
2 changed files with 4 additions and 1 deletions

3
changes/bug6861 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Fix handling of rendezvous client authorization types over 8.
Fixes bug 6841; bugfix on 0.2.1.5-alpha.

View File

@ -1250,7 +1250,7 @@ rend_parse_service_authorization(const or_options_t *options,
descriptor_cookie);
goto err;
}
auth_type_val = (descriptor_cookie_tmp[16] >> 4) + 1;
auth_type_val = (((uint8_t)descriptor_cookie_tmp[16]) >> 4) + 1;
if (auth_type_val < 1 || auth_type_val > 2) {
log_warn(LD_CONFIG, "Authorization cookie has unknown authorization "
"type encoded.");