summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-02-15Merge branch 'bug18105'Nick Mathewson
2018-02-15Merge branch 'bug24484_squashed'Nick Mathewson
2018-02-15Remove workaround code for systems where free(NULL) is busted.Nick Mathewson
Add an autoconf test to make sure we won't regret it. Closes ticket 24484.
2018-02-15Bump version in master to 0.3.4.0-alpha-devtor-0.3.4.0-alpha-devNick Mathewson
2018-02-15rust protover: match the C implementation on empty-str casesNick Mathewson
Empty versions lists are permitted; empty keywords are not.
2018-02-15Forbid u32::MAX as a protover range element in rustNick Mathewson
Part of the 25249 fix to make rust match the C.
2018-02-15Rust protover compat: forbid more than MAX_VERSIONS_TO_EXPAND in a rangeNick Mathewson
Also correct MAX_VERSIONS_TO_EXPAND to match the C. NOTE that this patch leads to incorrect behavior: the C code allows huge ranges; it just doesn't allow votes on them (currently). For full compatibility, we'll need to make the rust code store ranges as ranges natively, possibly using something like the range_map crate. Still, this patch is smaller than a "proper" fix. Fixes TROVE-2018-003.
2018-02-14Merge remote-tracking branch 'mikeperry/bug24769'Nick Mathewson
2018-02-13Merge branch 'tests_rust'Nick Mathewson
2018-02-13Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-13Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05David Goulet
2018-02-13dos: Add extra safety asserts in cc_stats_refill_bucket()David Goulet
Never allow the function to set a bucket value above the allowed circuit burst. Closes #25202 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13dos: Don't set consensus param if we aren't a public relayDavid Goulet
We had this safeguard around dos_init() but not when the consensus changes which can modify consensus parameters and possibly enable the DoS mitigation even if tor wasn't a public relay. Fixes #25223 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-12Have tor_addr hashes return a randomized hash for AF_UNSPEC.Nick Mathewson
We don't expect this to come up very much, but we may as well make sure that the value isn't predictable (as we do for the other addresses) in case the issue ever comes up. Spotted by teor.
2018-02-12Fix a typo in an address_set.c comment.Nick Mathewson
2018-02-11Merge remote-tracking branch 'isis/bug25127_redux'Nick Mathewson
2018-02-11fix compilation.Nick Mathewson
2018-02-11Merge branch 'bug25120'Nick Mathewson
2018-02-11Lower log-level in different error conditions in entropy selection.Alexander Færøy
This patch lowers the log-level from warning to info in the cases where we are going to attempt another method as entropy source to hopefully make the user feel less concerned. See: https://bugs.torproject.org/25120
2018-02-10Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-10Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-10Merge branch 'bug24978_029_enable' into maint-0.2.9Nick Mathewson
2018-02-10Bump version to 0.3.3.2-alpha-devNick Mathewson
2018-02-10rust: Replace two `unwrap()`s in FFI code with `unwrap_or()`s.Isis Lovecruft
2018-02-09Bump to 0.3.3.2-alphaNick Mathewson
2018-02-09whitespace and typo cleanupsRoger Dingledine
2018-02-09Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-09test: DoS test to make sure we exclude known relaysDavid Goulet
Part of #25193 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-09dos: Exclude known relays from client connection countDavid Goulet
This is to avoid positively identifying Exit relays if tor client connection comes from them that is reentering the network. One thing to note is that this is done only in the DoS subsystem but we'll still add it to the geoip cache as a "client" seen. This is done that way so to avoid as much as possible changing the current behavior of the geoip client cache since this is being backported. Closes #25193 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-08Add a "make test-rust" target to run the rust tests only.Nick Mathewson
2018-02-08Merge remote-tracking branch 'frewsxcv/frewsxcv-protover'Nick Mathewson
2018-02-08Stop claiming that compute_for_old_tor() returns pairsNick Mathewson
2018-02-08Remove new unsafe {} use.Nick Mathewson
Rationale: this helps for performance only, but we don't actually have any reason to think that the checks here are performance-critical. Let's not normalize the use of unsafe {}.
2018-02-08Merge remote-tracking branch 'isis/bug25127'Nick Mathewson
2018-02-08Merge branch 'ticket25183_029_01' into ticket24902_029_05David Goulet
2018-02-08test: Add unit tests for addressset.cDavid Goulet
This also adds one that tests the integration with the nodelist. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-08Add an address_set to the nodelist.Nick Mathewson
This set is rebuilt whenever a consensus arrives. In between consensuses, it is add-only.
2018-02-08Function to add an ipv4 address to an address_setNick Mathewson
This is a convenience function, so callers don't need to wrap the IPv4 address.
2018-02-08Add an address-set backend using a bloom filter.Nick Mathewson
We're going to need this to make our anti-DoS code (see 24902) more robust.
2018-02-08Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-08Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-08Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-08Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson
2018-02-08dirserv: Improve returned message when relay is rejectedDavid Goulet
Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-08Update geoip and geoip6 to the February 7 2018 database.Karsten Loesing
2018-02-07protover: Fix memleak in Rust impl of protover_compute_for_old_tor.Isis Lovecruft
* FIXES #25127: https://bugs.torproject.org/25127 * ADDS a new module to the Rust tor_util crate for small utilities for working with static strings between languages. * CHANGES the return type of protover_compute_for_old_tor to point to immutable data. * CHANGES the code from the previous commit to use the new static string utilities.
2018-02-07remove blank line between function-comment and functionRoger Dingledine
also be more consistent about punctuation in doxygen comments
2018-02-07Merge remote-tracking branch 'dgoulet/ticket25163_033_01'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion