torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,317 Commits 53 Branches 631 Tags
3ef40f69937abc105877189fbecd78df67dd2d8e
Commit Graph

8099 Commits

Author SHA1 Message Date
Nick Mathewson 3ef40f6993 Merge remote-tracking branch 'origin/maint-0.2.2' 2011-11-15 11:42:38 -05:00
Nick Mathewson 5bea660f8e Use real_addr in send_netinfo 
Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349.
 2011-11-14 22:43:40 -05:00
Nick Mathewson 4af82fb388 Merge remote-tracking branch 'public/bug4367' 2011-11-14 22:35:49 -05:00
Nick Mathewson f0589da0e3 Merge remote-tracking branch 'origin/maint-0.2.2' 2011-11-09 11:04:40 -05:00
Nick Mathewson d4489a2851 Rewrite comment at head of eventdns.c 
Let's make it more obvious to the everyday reader that eventdns.c is
  a) Based on Libevent's evdns.c
  b) Slated for demolition
  c) Supposed to keep API-compatibility with Libevent.
  d) Not worth tweaking unless there's a bug.
 2011-11-09 00:23:44 -05:00
Robert Ransom 565463243c Include HiddenServiceDir in some warning messages 2011-11-07 17:02:50 -08:00
Robert Ransom bfb900e426 Add some XXXes 2011-11-07 15:32:43 -08:00
Robert Ransom ef2b0bd528 Add GETINFO md/id/* and md/name/* items for relay microdescs 2011-11-07 15:32:33 -08:00
Nick Mathewson 4a7225d4c9 Merge remote-tracking branch 'rransom-tor/bug4411' 2011-11-07 11:57:07 -05:00
Robert Ransom 749b37bcf4 Fix assert on clients of and authorities for v0 HS descs 2011-11-07 08:48:23 -08:00
Nick Mathewson ceebc8283f Merge remote-tracking branch 'origin/maint-0.2.2' 2011-11-07 11:48:02 -05:00
Nick Mathewson ca282e5326 Merge branch 'bug4424' into maint-0.2.2 2011-11-07 11:47:28 -05:00
Nick Mathewson 02d89c5c66 Remove an extraneous "if" in the 4424 fix 2011-11-07 11:46:51 -05:00
Robert Ransom 65a0d7e7ef Don't leak an extend_info_t in rend_client_any_intro_points_usable 2011-11-07 08:35:51 -08:00
Nick Mathewson 51f53b590e Merge remote-tracking branch 'origin/maint-0.2.2' 2011-11-07 10:44:02 -05:00
Nick Mathewson 4d8306e0e9 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 2011-11-07 10:42:34 -05:00
Dan Rosenberg d5161ab895 Fix remotely triggerable assert during ip decryption 
Fixes bug 4410.
 2011-11-06 17:23:14 +01:00
Nick Mathewson c1005dd6d3 Merge remote-tracking branch 'origin/maint-0.2.2' 2011-11-03 13:24:46 -04:00
George Kadianakis 3ae96845d3 Fix a memleak when fetching descriptors for bridges in ExcludeNodes. 2011-11-03 13:23:50 -04:00
Nick Mathewson 325a659cb1 Even when we can't answer an AUTH_CHALLENGE, send NETINFO. 
Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty".
 2011-11-03 12:40:02 -04:00
Nick Mathewson 88c4b425bd Fix bug 4367: correctly detect auth_challenge cells we can't use 
Found by frosty_un, bugfix on 0.2.3.6-alpha, fix suggested by arma.
 2011-11-03 11:52:35 -04:00
Andrea Gelmini 72d4d762c1 Remove some duplicate includes 2011-11-03 10:23:33 -04:00
Sebastian Hahn eb30999972 Fix a check-spaces complaint 2011-11-02 20:57:58 +01:00
Sebastian Hahn c98faa1a23 Resolve a crash when running as dirauth 
When we're asked for our own descriptor, don't crash.
 2011-11-02 20:57:23 +01:00
Roger Dingledine eeb6588389 bridges send netinfo cells like clients on outgoing conns 
fixes bug 4348
 2011-10-29 21:43:23 -04:00
Sebastian Hahn dfdb4fde1a Disable stats requiring geoip info if we have none 
In other parts of the code we will otherwise attempt to collect these
statistics, and that will lead to crashes.
 2011-10-29 11:20:02 +02:00
Nick Mathewson 4dd8d811d6 Merge branch 'bug4343' 2011-10-28 18:05:25 -04:00
Nick Mathewson 212c3acd42 Merge remote-tracking branch 'origin/maint-0.2.2' 
Conflicts:
	src/or/command.c
 2011-10-28 18:02:57 -04:00
Nick Mathewson cf8bffa359 Discard all cells on a marked connection 
Fix for bug 4299
 2011-10-28 17:04:15 -04:00
Nick Mathewson 2018f86e0c "Authetnicate" is not the usual spelling 2011-10-28 16:41:04 -04:00
Nick Mathewson c2a098e980 Fix a double-free that would occur on an invalid cert in a CERTS cell 
We would stash the certs in the handshake state before checking them
for validity... and then if they turned out to be invalid, we'd give
an error and free them.  Then, later, we'd free them again when we
tore down the connection.

Fixes bug 4343; fix on 0.2.3.6-alpha.
 2011-10-28 16:38:56 -04:00
Nick Mathewson a2517fa77c Merge remote-tracking branch 'origin/maint-0.2.2' 2011-10-28 09:53:23 -04:00
Sebastian Hahn f6b1dc2805 Fix typo, spotted by tmpname0901. Thanks! 2011-10-28 09:52:24 -04:00
Sebastian Hahn 2dec6597af Merge branch 'maint-0.2.2_secfix' into master_secfix 
Conflicts:
	src/common/tortls.c
	src/or/connection_or.c
	src/or/dirserv.c
	src/or/or.h
 2011-10-27 00:38:45 +02:00
Robert Ransom 4684ced1b3 Add option to give guard flag to relays without the CVE-2011-2768 fix 
This way, all of the DA operators can upgrade immediately, without nuking
every client's set of entry guards as soon as a majority of them upgrade.

Until enough guards have upgraded, a majority of dirauths should set this
config option so that there are still enough guards in the network. After
a few days pass, all dirauths should use the default.
 2011-10-26 23:56:47 +02:00
Robert Ransom 00fffbc1a1 Don't give the Guard flag to relays without the CVE-2011-2768 fix 2011-10-26 23:42:39 +02:00
Robert Ransom 4d0f152aad Make tor_version_same_series non-static 2011-10-26 23:36:30 +02:00
Sebastian Hahn df05e5ef4d Merge branch 'maint-0.2.1_secfix' into maint-0.2.2_secfix 
Conflicts:
	src/or/connection_or.c
 2011-10-26 23:30:27 +02:00
Robert Ransom a74e7fd40f Reject create cells on outgoing OR connections from bridges 2011-10-26 23:21:14 +02:00
Robert Ransom c05bb53508 Mark which OR connections are outgoing 2011-10-26 23:21:11 +02:00
Robert Ransom af12c39d6d Don't use any OR connection which sent us a CREATE_FAST cell for an EXTEND 
Fix suggested by Nick Mathewson.
 2011-10-26 23:20:56 +02:00
Roger Dingledine a68867b150 manually backport a5232e0c4c 2011-10-26 17:11:52 -04:00
Roger Dingledine cecc5b7aa1 stop asserting at boot 
The patch for 3228 made us try to run init_keys() before we had loaded
our state file, resulting in an assert inside init_keys. We had moved
it too early in the function.

Now it's later in the function, but still above the accounting calls.
 2011-10-26 22:09:44 +02:00
Nick Mathewson 55d9e4b8ba Reinit keys at the start of options_act(). 
Previously we did this nearer to the end (in the old_options &&
transition_affects_workers() block).  But other stuff cares about
keys being consistent with options... particularly anything which
tries to access a key, which can die in assert_identity_keys_ok().

Fixes bug 3228; bugfix on 0.2.2.18-alpha.

Conflicts:

	src/or/config.c
 2011-10-26 22:09:44 +02:00
Robert Ransom 62c29a93ba Don't crash a bridge authority on SIGHUP if it's not in the consensus 
Fixes bug 2572.
 2011-10-26 22:09:44 +02:00
Sebastian Hahn 9082898944 Fix assert for relay/bridge state change 
When we added support for separate client tls certs on bridges in
a2bb0bfdd5 we forgot to correctly initialize this when changing
from relay to bridge or vice versa while Tor is running. Fix that
by always initializing keys when the state changes.

Fixes bug 2433.

Conflicts:

	src/or/config.c
 2011-10-26 22:09:44 +02:00
Nick Mathewson b1632c3fb7 Fix memory leak in retry_all_listeners: Coverity CID 485 2011-10-26 13:22:20 -04:00
Nick Mathewson 097ed9998b Fix memory leak in options_act_reversible: fix Coverity CID 486,487 2011-10-26 13:22:13 -04:00
Nick Mathewson e0a053be01 Do not tread vpadding cell as versions cell. Not in any released version. 2011-10-26 11:50:50 -04:00
George Kadianakis 9d53c00911 Fix a NULL pointer dereference in parse_server_transport_line(). 2011-10-26 11:21:11 -04:00