diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-17 10:28:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-17 10:28:35 -0400 |
| commit | 5511d21d2b99fb686f3ad57be1a16d383f77adc9 (patch) | |
| tree | 97a25fbc174aff07c07c555cd9872eda73444ebe | |
| parent | c3f526ed64012f64589b926082ff5e542ec7d18d (diff) | |
| parent | 96d2a21683cdfe25b549e13fa450d4b12fb945b2 (diff) | |
| download | tor-5511d21d2b99fb686f3ad57be1a16d383f77adc9.tar.gz tor-5511d21d2b99fb686f3ad57be1a16d383f77adc9.zip | |
Merge branch 'bug6861_typofix'
| -rw-r--r-- | changes/bug6861 | 3 | ||||
| -rw-r--r-- | src/or/rendclient.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug6861 b/changes/bug6861 new file mode 100644 index 0000000000..1040bd7a36 --- /dev/null +++ b/changes/bug6861 @@ -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. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 73e1c41d7b..2104a5b3d4 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -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."); |