diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/or/control.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -81,7 +81,8 @@ Changes in version 0.2.0.20-rc - 2008-02-24 o Minor bugfixes (memory leaks and code problems): - We were leaking a file descriptor if Tor started with a zero-length cached-descriptors file. Patch by freddy77; bugfix on 0.1.2. - - Detect size overflow in zlib code. Reported by Dan Kaminsky. + - Detect size overflow in zlib code. Reported by Justin Ferguson and + Dan Kaminsky. - We were comparing the raw BridgePassword entry with a base64'ed version of it, when handling a "/tor/networkstatus-bridges" directory request. Now compare correctly. Noticed by Veracode. diff --git a/src/or/control.c b/src/or/control.c index fb4af9112b..3cc9c5fe2f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2541,7 +2541,8 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len, char *esc_cfile = esc_for_log(cfile); char *methods; { - int passwd = (options->HashedControlPassword != NULL); + int passwd = (options->HashedControlPassword != NULL || + options->HashedControlSessionPassword != NULL); smartlist_t *mlist = smartlist_create(); if (cookies) smartlist_add(mlist, (char*)"COOKIE"); |