aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-15
|\ | | | | | | | | | | Conflicts: src/or/routerparse.c src/or/test.c
| * Merge branch 'bug2352_obsize' into maint-0.2.1Nick Mathewson2011-01-15
| |\
| | * catch another overlong malloc possibility. found by cypherpunksNick Mathewson2011-01-15
| | |
| | * Impose maximum sizes on parsed objectsNick Mathewson2011-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | An object, you'll recall, is something between -----BEGIN----- and -----END----- tags in a directory document. Some of our code, as doorss has noted in bug 2352, could assert if one of these ever overflowed SIZE_T_CEILING but not INT_MAX. As a solution, I'm setting a maximum size on a single object such that neither of these limits will ever be hit. I'm also fixing the INT_MAX checks, just to be sure.
| | * Add logic in routerparse to not read overlong private keysNick Mathewson2011-01-10
| | | | | | | | | | | | | | | I am not at all sure that it is possible to trigger a bug here, but better safe than sorry.
* | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-15
|\| |
| * | Add missing check for hostname answer_len in dnsserv sizeNick Mathewson2011-01-15
| | | | | | | | | | | | This is checked elsewhere too, but let's be RFC-conformant.
* | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-15
|\| |
| * | Merge branch 'bug2324_uncompress' into maint-0.2.1Nick Mathewson2011-01-15
| |\ \
| | * | clean up message; explain a magic number in a commentNick Mathewson2011-01-15
| | | |
| | * | Fix a SIZE_T_CEILING check in torgzip.c; noticed by cypherpunksNick Mathewson2011-01-05
| | | |
| | * | Detect and disallow compression bombsNick Mathewson2011-01-03
| | | |
* | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/networkstatus.c src/or/rendcommon.c src/or/routerparse.c src/or/test.c
| * | | Fix a heap overflow found by debuger, and make it harder to make that ↵Nick Mathewson2011-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mistake again Our public key functions assumed that they were always writing into a large enough buffer. In one case, they weren't. (Incorporates fixes from sebastian)
| * | | Always nul-terminate the result passed to evdns_server_add_ptr_replyNick Mathewson2011-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In dnsserv_resolved(), we carefully made a nul-terminated copy of the answer in a PTR RESOLVED cell... then never used that nul-terminated copy. Ouch. Surprisingly this one isn't as huge a security problem as it could be. The only place where the input to dnsserv_resolved wasn't necessarily nul-terminated was when it was called indirectly from relay.c with the contents of a relay cell's payload. If the end of the payload was filled with junk, eventdns.c would take the strdup() of the name [This part is bad; we might crash there if the cell is in a bad part of the stack or the heap] and get a name of at least length 495[*]. eventdns.c then rejects any name of length over 255, so the bogus data would be neither transmitted nor altered. [*] If the name was less than 495 bytes long, the client wouldn't actually be reading off the end of the cell. Nonetheless this is a reasonably annoying bug. Better fix it. Found while looking at bug 2332, reported by doorss. Bugfix on 0.2.0.1-alpha.
* | | | Fix another instance of "128" in buffers.c. More bug2330.Nick Mathewson2011-01-15
| | | |
* | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-12
|\| | |
| * | | Make our replacement INT32_MAX always signedNick Mathewson2011-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The C standard says that INT32_MAX is supposed to be a signed integer. On platforms that have it, we get the correct platform-defined value. Our own replacement, however, was unsigned. That's going to cause a bug somewhere eventually.
* | | | Merge remote branch 'public/bug2363' into maint-0.2.2Nick Mathewson2011-01-12
|\ \ \ \
| * | | | Add missing parens to evdns_base_resolve_* macros while I am at itNick Mathewson2011-01-09
| | | | |
| * | | | Fix check for failed evdns request creationNick Mathewson2011-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using libevent 2, we use evdns_base_resolve_*(). When not, we fake evdns_base_resolve_*() using evdns_resolve_*(). Our old check was looking for negative values (like libevent 2 returns), but our eventdns.c code returns 1. This code makes the check just test for nonzero. Note that this broken check was not for _resolve_ failures or even for failures to _launch_ a resolve: it was for failures to _create_ or _encode_ a resolve request. Bug introduced in 81eee0ecfff3dac1e9438719d2f7dc0ba7e84a71; found by lodger; uploaded to trac by rransom. Bug 2363. Fix on 0.2.2.6-alpha.
* | | | | Merge branch 'bug2331' into maint-0.2.2Nick Mathewson2011-01-12
|\ \ \ \ \
| * | | | | Fix size_t vs unsigned comparison tooNick Mathewson2011-01-05
| | | | | |
| * | | | | Fix up size and sign issues in base32 codeNick Mathewson2011-01-03
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 2331.
* | | | | | Merge branch 'bug2346' into maint-0.2.2Nick Mathewson2011-01-12
|\ \ \ \ \ \
| * | | | | | Explain bug2346 fix better based on suggestions from armaNick Mathewson2011-01-12
| | | | | | |
| * | | | | | Wait 60 minutes before retrying failed state save; bug2346Nick Mathewson2011-01-10
| | | | | | |
* | | | | | | Pull up more data when parsing socks messagesNick Mathewson2011-01-10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we only looked at up to 128 bytes. This is a bad idea since socks messages can be at least 256+x bytes long. Now we look at up to 512 bytes; this should be enough for 0.2.2.x to handle all valid SOCKS messages. For 0.2.3.x, we can think about handling trickier cases. Fixes 2330. Bugfix on 0.2.0.16-alpha.
* | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-10
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Update to the January 1 2011 Maxmind GeoLite Country database.Karsten Loesing2011-01-10
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-07
|\| | |
| * | | Remove a loud info log messageNick Mathewson2011-01-07
| | | |
| * | | Correctly detect and exclude addresses outside of our virtual address rangeNick Mathewson2011-01-07
| | | | | | | | | | | | | | | | | | | | Found by cypherpunks; fixes more of 2328. Bug was introduced in 3623a122; first appeared in 0.2.0.5-alpha.
* | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-06
|\| | | | |/ / |/| |
| * | Merge branch 'bug2328_021' into maint-0.2.1Nick Mathewson2011-01-06
| |\ \ | | |/ | |/|
| | * Notice a little faster if we're running out of virtual addressesNick Mathewson2011-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not decrementing "available" every time we did ++next_virtual_addr in addressmap_get_virtual_address: we left out the --available when we skipped .00 and .255 addresses. This didn't actually cause a bug in most cases, since the failure mode was to keep looping around the virtual addresses until we found one, or until available hit zero. It could have given you an infinite loop rather than a useful message, however, if you said "VirtualAddrNetwork 127.0.0.255/32" or something broken like that. Spotted by cypherpunks
| | * Handle a NULL return from addressmap_get_virtual_addressNick Mathewson2011-01-05
| | | | | | | | | | | | Fix for bug 2328; bugfix on 0.1.2.1-alpha; bug found by doorss.
| | * Fix a double-counting bug in addrmap_get_virtual_addressNick Mathewson2011-01-05
| | | | | | | | | | | | | | | | | | We were decrementing "available" twice for each in-use address we ran across. This would make us declare that we ran out of virtual addresses when the address space was only half full.
* | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
|\| |
| * | Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1Nick Mathewson2011-01-03
| | | | | | | | | | | | Spotted by doors, fixes bug 2326.
* | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
|\| |
| * | Check size against SIZE_T_CEILING in realloc too.Nick Mathewson2011-01-03
| | | | | | | | | | | | Fixes bug 2324.
* | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
|\| |
| * | Never include pthread.h when building for Windows.Nick Mathewson2011-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, we never use pthreads, since it doesn't usually exist, and when it does it tends to be a little weirdly-behaved. But some mingw installations have a pthreads installed, so autoconf detects pthread.h and tells us about it. This would make us include pthread.h, which could make for trouble when the iffy pthread.h tried to include config.h. This patch changes compat.h so that we never include pthread.h on Windows. Fixes bug 2313; bugfix on 0.1.0.1-rc.
* | | Merge remote branch 'sebastian/bug2314' into maint-0.2.2Nick Mathewson2011-01-03
|\ \ \
| * | | Fix compile wanrings revealed by gcc 4.5 on mingwSebastian Hahn2010-12-27
| | | |
* | | | Fix a function formatting warning in rephist.cNick Mathewson2011-01-03
| | | |
* | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: src/or/routerparse.c
| * | | fix whitespace issuesNick Mathewson2011-01-03
| | | |
* | | | Bump copyright statements to 2011 (0.2.2)Nick Mathewson2011-01-03
| | | |