Nick Mathewson
729f404efe
Add logic in routerparse to not read overlong private keys
...
I am not at all sure that it is possible to trigger a bug here,
but better safe than sorry.
2011-01-10 12:07:34 -05:00
Karsten Loesing
d43cba6c69
Update to the January 1 2011 Maxmind GeoLite Country database.
2011-01-10 10:37:54 +01:00
Nick Mathewson
efc9a84108
Add missing parens to evdns_base_resolve_* macros while I am at it
2011-01-09 19:05:06 -05:00
Nick Mathewson
68d5b6bc52
Fix check for failed evdns request creation
...
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.
2011-01-09 19:02:57 -05:00
Nick Mathewson
732275bb81
Describe tor-resolve defaults. Bug 2364.
2011-01-09 15:40:40 -05:00
Nick Mathewson
54135b72f8
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-07 22:04:40 -05:00
Nick Mathewson
045e6ebd31
Remove a loud info log message
2011-01-07 22:03:22 -05:00
Nick Mathewson
0a35ac6a22
Correctly detect and exclude addresses outside of our virtual address range
...
Found by cypherpunks; fixes more of 2328. Bug was introduced in 3623a122;
first appeared in 0.2.0.5-alpha.
2011-01-07 12:24:36 -05:00
Nick Mathewson
d6329eda96
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-06 13:37:39 -05:00
Nick Mathewson
d6b49c55c5
Merge branch 'bug2328_021' into maint-0.2.1
2011-01-06 13:36:29 -05:00
Nick Mathewson
2008728df7
Notice a little faster if we're running out of virtual addresses
...
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
2011-01-06 13:29:36 -05:00
Nick Mathewson
eabddd8ca0
Handle a NULL return from addressmap_get_virtual_address
...
Fix for bug 2328; bugfix on 0.1.2.1-alpha; bug found by doorss.
2011-01-05 16:36:48 -05:00
Nick Mathewson
31d6659d97
Fix a double-counting bug in addrmap_get_virtual_address
...
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.
2011-01-05 16:02:43 -05:00
Nick Mathewson
240fa42aac
Fix size_t vs unsigned comparison too
2011-01-05 12:49:02 -05:00
Nick Mathewson
d14b0d54d2
Fix a SIZE_T_CEILING check in torgzip.c; noticed by cypherpunks
2011-01-05 12:42:34 -05:00
Nick Mathewson
0e9d7f105d
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 17:24:32 -05:00
Nick Mathewson
e4320689cc
Note that Tor requires Automake 1.7. Fixes bug 2305
2011-01-03 17:24:16 -05:00
Nick Mathewson
81d69f4c2d
Detect signed size_t and report an error at configure time.
2011-01-03 16:54:57 -05:00
Nick Mathewson
0222228d64
Fix up size and sign issues in base32 code
...
Fixes bug 2331.
2011-01-03 16:16:53 -05:00
Nick Mathewson
64798dab4f
Detect and disallow compression bombs
2011-01-03 15:54:23 -05:00
Nick Mathewson
f089804332
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 15:31:19 -05:00
Nick Mathewson
e365aee971
Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1
...
Spotted by doors, fixes bug 2326.
2011-01-03 15:30:11 -05:00
Nick Mathewson
cee433d751
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 15:15:54 -05:00
Nick Mathewson
e09ab69703
Check size against SIZE_T_CEILING in realloc too.
...
Fixes bug 2324.
2011-01-03 15:15:27 -05:00
Nick Mathewson
27cefef3a2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-03 13:18:33 -05:00
Nick Mathewson
bb5f99d4df
Merge remote branch 'sebastian/bug2314' into maint-0.2.2
2011-01-03 12:47:14 -05:00
Nick Mathewson
5c09431cc7
Never include pthread.h when building for Windows.
...
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.
2011-01-03 12:45:13 -05:00
Nick Mathewson
40ef9087cf
Fix a function formatting warning in rephist.c
2011-01-03 11:59:47 -05:00
Nick Mathewson
66039d9843
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/routerparse.c
2011-01-03 11:58:59 -05:00
Nick Mathewson
989db9aed1
fix whitespace issues
2011-01-03 11:57:42 -05:00
Nick Mathewson
30b3475e6d
Bump copyright statements to 2011 (0.2.2)
2011-01-03 11:52:09 -05:00
Nick Mathewson
f1de329e78
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/common/test.h
src/or/test.c
2011-01-03 11:51:17 -05:00
Nick Mathewson
1a07348a50
Bump copyright statements to 2011
2011-01-03 11:50:39 -05:00
Sebastian Hahn
59a3d536d8
Fix compile without warnings on OS X 10.6
2010-12-27 11:37:16 +01:00
Sebastian Hahn
9ecf133686
Fix compile wanrings revealed by gcc 4.5 on mingw
2010-12-27 09:47:41 +01:00
Nick Mathewson
e895919b17
Merge remote branch 'public/bug2060' into maint-0.2.2
2010-12-21 15:53:03 -05:00
Nick Mathewson
cdbd6d0fe8
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
2010-12-21 15:48:14 -05:00
Nick Mathewson
029ca804b2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-12-21 15:48:06 -05:00
Nick Mathewson
69771bb5fc
Merge remote branch 'public/bug2190_021' into maint-0.2.1
2010-12-21 15:44:50 -05:00
Roger Dingledine
a62038f01d
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-12-16 19:23:21 -05:00
Roger Dingledine
ef5b3680c6
put 0.2.1.28 release notes in place too
2010-12-16 19:20:18 -05:00
Roger Dingledine
53c14507eb
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-12-16 17:24:21 -05:00
Roger Dingledine
c63c937465
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
2010-12-16 17:24:11 -05:00
Roger Dingledine
975ffe4398
Merge commit 'nickm/fix_security_bug_021' into maint-0.2.1
2010-12-16 16:59:12 -05:00
Nick Mathewson
591f65dde6
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-12-16 10:05:07 -05:00
Karsten Loesing
3c3b1d14fd
Change gabelmoo's IP address and ports.
2010-12-16 13:28:30 +01:00
Nick Mathewson
b5e293afe6
Merge remote branch fix_security_bug_021 into fix_security_bug_022
...
Conflicts:
src/common/memarea.c
src/or/or.h
src/or/rendclient.c
2010-12-15 22:48:23 -05:00
Nick Mathewson
b0def605a5
Add a changelog entry
2010-12-15 22:35:07 -05:00
Nick Mathewson
b8a7bad799
Make payloads into uint8_t.
...
This will avoid some signed/unsigned assignment-related bugs.
2010-12-15 22:31:11 -05:00
Nick Mathewson
ddfb398494
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/config/geoip
2010-12-14 14:13:24 -05:00