nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

forward-port r13777

Browse Source 
svn:r13778
This commit is contained in:
Roger Dingledine 2008-02-29 01:45:06 +00:00
parent 04efc74e18
commit c5a7ff8e43
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -81,7 +81,8 @@ Changes in version 0.2.0.20-rc - 2008-02-24
o Minor bugfixes (memory leaks and code problems): o Minor bugfixes (memory leaks and code problems):
- We were leaking a file descriptor if Tor started with a zero-length - We were leaking a file descriptor if Tor started with a zero-length
cached-descriptors file. Patch by freddy77; bugfix on 0.1.2. 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 - We were comparing the raw BridgePassword entry with a base64'ed
version of it, when handling a "/tor/networkstatus-bridges" version of it, when handling a "/tor/networkstatus-bridges"
directory request. Now compare correctly. Noticed by Veracode. directory request. Now compare correctly. Noticed by Veracode.

3
src/or/control.c
View File

@ -2541,7 +2541,8 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
char *esc_cfile = esc_for_log(cfile); char *esc_cfile = esc_for_log(cfile);
char *methods; char *methods;
{ {
int passwd = (options->HashedControlPassword != NULL); int passwd = (options->HashedControlPassword != NULL ||
options->HashedControlSessionPassword != NULL);
smartlist_t *mlist = smartlist_create(); smartlist_t *mlist = smartlist_create();
if (cookies) if (cookies)
smartlist_add(mlist, (char*)"COOKIE"); smartlist_add(mlist, (char*)"COOKIE");