Nick Mathewson
a857f61e27
Merge remote-tracking branch 'rransom-tor/bug3332-v2'
2011-06-15 11:33:40 -04:00
Robert Ransom
44eafa9697
Assert that HS operations are not performed using single-hop circuits
...
(with fixes by Nick Mathewson to unbreak the build)
2011-06-14 21:32:49 -07:00
Nick Mathewson
875a551409
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 13:46:46 -04:00
Nick Mathewson
a25c0a5bf8
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
2011-06-14 13:46:10 -04:00
Nick Mathewson
e70e8367c9
Add changes file for bug3393
2011-06-14 13:45:12 -04:00
Nick Mathewson
19febed9e5
Merge remote-tracking branch 'rransom-tor/bug3349'
2011-06-14 13:39:26 -04:00
Nick Mathewson
8839b86085
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 12:25:33 -04:00
Nick Mathewson
e470f6a886
changelog entry for bug3369
2011-06-13 13:42:00 -04:00
Sebastian Hahn
910dadd6ea
Ensure the release tarball contains all manpages
...
Thanks to Nick for the idea for the fix.
2011-06-12 13:58:53 +02:00
Nick Mathewson
ecc9a364c2
fix typo in changes/coverity_master spotted by rransom
2011-06-10 16:40:47 -04:00
Nick Mathewson
b2e7c356db
Prefer tt_assert in unit tests, not tor_assert
2011-06-08 20:33:53 -04:00
Nick Mathewson
2fd5603057
tweak coverity_master changes file
2011-06-08 20:29:10 -04:00
Sebastian Hahn
8283767365
Fix a memleak in nodelist_assert_ok()
2011-06-08 21:38:42 +02:00
Sebastian Hahn
f303274490
Fix a rare memleak during stats writing
...
If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak
memory.
2011-06-08 21:35:26 +02:00
Sebastian Hahn
680646e0de
Don't use signed 1-bit bitfields
...
This was harmless, we never compared it to anything but itself or 0.
But Coverity complained, and it had a point.
2011-06-08 21:30:41 +02:00
Sebastian Hahn
e6fff7235e
Remove a few dead assignments during router parsing
2011-06-08 21:30:40 +02:00
Sebastian Hahn
3033f8459b
Remove a dead variable in the heartbeat code
2011-06-08 21:11:42 +02:00
Sebastian Hahn
ff75e8b02d
Check some more return values in unit tests
2011-06-08 21:08:56 +02:00
Sebastian Hahn
db7dd3ee7a
remove some dead code, found by coverity
2011-06-08 21:07:54 +02:00
Sebastian Hahn
3bf808c341
Fix a minor coverity-found bug in tests
2011-06-08 20:00:47 +02:00
Nick Mathewson
d696bd1bfc
Fix crash bug (3361) when setting off-flavor networkstatus
...
When we set a networkstatus in the non-preferred flavor, we'd check
the time in the current_consensus. But that might have been NULL,
which could produce a crash as seen in bug 3361.
2011-06-07 14:46:28 -04:00
Nick Mathewson
8cd5a3c186
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-06 16:20:22 -04:00
Nick Mathewson
9e3fc5f616
Merge branch 'bug3306_nm_squashed' into maint-0.2.2
2011-06-06 16:18:24 -04:00
Nick Mathewson
42e4e156d9
Detect insanely large circuit build state; don't give its length to rand_int
2011-06-06 16:18:06 -04:00
Nick Mathewson
5afab5ca19
Check maximum properly in crypto_rand_int()
...
George Kadianakis notes that if you give crypto_rand_int() a value
above INT_MAX, it can return a negative number, which is not what
the documentation would imply.
The simple solution is to assert that the input is in [1,INT_MAX+1].
If in the future we need a random-value function that can return
values up to UINT_MAX, we can add one.
Fixes bug 3306; bugfix on 0.2.2pre14.
2011-06-06 16:18:06 -04:00
Roger Dingledine
96da10aace
Merge branch 'maint-0.2.2'
2011-06-05 11:14:28 -04:00
Roger Dingledine
83e3975c8b
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-06-05 11:13:50 -04:00
Roger Dingledine
bf4b819aae
move to the june 1 2011 maxmind geoip db
2011-06-05 11:12:28 -04:00
Robert Ransom
8a69cc0468
Report SIGNAL event to controllers when acting on delayed NEWNYM
...
Fixes bug 3349.
2011-06-05 05:43:27 -07:00
Nick Mathewson
12f9c91c06
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 11:36:21 -04:00
Nick Mathewson
7aa20b20bf
Merge branch 'bug3318c' into maint-0.2.2
2011-06-03 11:34:32 -04:00
Nick Mathewson
bbf2fee8ff
Reject 128-byte keys that are not 1024-bit
...
When we added the check for key size, we required that the keys be
128 bytes. But RSA_size (which defers to BN_num_bytes) will return
128 for keys of length 1017..1024. This patch adds a new
crypto_pk_num_bits() that returns the actual number of significant
bits in the modulus, and uses that to enforce key sizes.
Also, credit the original bug3318 in the changes file.
2011-06-03 11:31:19 -04:00
Nick Mathewson
50e4c98a5a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 11:18:03 -04:00
Nick Mathewson
de069f5ea7
Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
2011-06-03 11:16:48 -04:00
Nick Mathewson
13ec1bf5c2
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 10:47:35 -04:00
Nick Mathewson
b79d50dfcc
Changes file for bug2355.
2011-06-02 15:11:21 -04:00
Nick Mathewson
587cc31140
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/rendclient.c
2011-06-02 15:07:08 -04:00
Nick Mathewson
80038b5453
Merge remote-tracking branch 'rransom-tor/bug3309' into maint-0.2.2
2011-06-02 15:06:04 -04:00
Nick Mathewson
6a320b9905
Merge remote-tracking branch 'origin/maint-0.2.2'
...
This merge was a bit nontrivial, since I had to write a new
node_is_a_configured_bridge to parallel router_is_a_configured_bridge.
Conflicts:
src/or/circuitbuild.c
2011-06-02 13:05:00 -04:00
Nick Mathewson
385c59798a
Merge remote-tracking branch 'arma/bug3321' into maint-0.2.2
2011-06-02 12:55:56 -04:00
Robert Ransom
fc4158dad7
Add info-level log messages during HS-client-state purge
...
I hope these will never be useful, but having them and not needing them is
better than needing them and not having them.
2011-06-02 03:07:09 -07:00
Robert Ransom
b0e7925c02
Clear last_hid_serv_requests on SIGNAL NEWNYM
...
Fixes bug #3309 .
2011-06-02 02:52:40 -07:00
Nick Mathewson
a610ebc3a6
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-01 11:08:28 -04:00
Nick Mathewson
0fd3ad75da
Report wrong key sizes correctly
...
When we introduced NEED_KEY_1024 in routerparse.c back in
0.2.0.1-alpha, I forgot to add a *8 when logging the length of a
bad-length key.
Bugfix for 3318 on 0.2.0.1-alpha.
2011-06-01 11:07:17 -04:00
Roger Dingledine
7039c34519
fix a bridge edge case similar to 2511
...
If you had configured a bridge but then switched to a different bridge
via the controller, you would still be willing to use the old one.
2011-05-31 20:43:55 -04:00
Nick Mathewson
d0e7c545ba
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-30 16:14:45 -04:00
Nick Mathewson
e035cea031
Merge branch 'bug3216_v2' into maint-0.2.2
2011-05-30 16:12:53 -04:00
Nick Mathewson
d274f539e5
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-30 15:51:46 -04:00
Sebastian Hahn
ca538290af
Warn when two hs use the same directory
...
This simple implementation has a few issues, but it should do for
0.2.2.x. We will want to revisit this later and make it smarter.
2011-05-30 15:47:06 -04:00
Nick Mathewson
fa1d47293b
Merge remote-tracking branch 'origin/maint-0.2.2'
...
The conflicts were mainly caused by the routerinfo->node transition.
Conflicts:
src/or/circuitbuild.c
src/or/command.c
src/or/connection_edge.c
src/or/directory.c
src/or/dirserv.c
src/or/relay.c
src/or/rendservice.c
src/or/routerlist.c
2011-05-30 15:41:46 -04:00