summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-27Only define X509_get_not{BeforeAfter} if they are not definedNick Mathewson
(The originally submitted version of a15b2c57e1f901c531 broke with OpenSSL 1.1.0.)
2018-04-18mention 19429 in changes fileNick Mathewson
2018-04-18Changes file for openssl no-deprecated work.Nick Mathewson
2018-04-18Make test_tortls.c build with openssl no_deprecated.Nick Mathewson
Also for 19981.
2018-04-18Add support for openssl built with "no-deprecated".Nick Mathewson
Patch from Andrew John Hughes; partial fix for 19981.
2018-04-18Edit our openssl detection in autoconf to tolerate no-deprecated.Nick Mathewson
When openssl is built with no-deprecated, the TLSv1_1_method() function isn't visible in the headers. That's sad, because that method is what we were looking at. Instead, we now look at SSL_CIPHER_get_id(), which is present in OpenSSL 1.0.1 and later, which is _not_ deprecated, and which is also present in LibreSSL. Fixes ticket 25353. Not a bugfix exactly -- we never really worked with this configuration.
2018-04-17Fix a pointer size error in test_bridges.cNick Mathewson
sizeof(ret) is the size of the pointer, not the size of what it points to. Fortunately, we already have a function to compare tor_addr_port_t values for equality. Bugfix on c2c5b13e5d8a77e; bug not in any released Tor. Found by clang's scan-build.
2018-04-17Add an initialization case to node_get_prim_dirportNick Mathewson
Fixes a bug found by scan-build; bugfix on c2fa743806acc. Bug not in any released Tor.
2018-04-17Add a redundant memset to node_get_pref_ipv6_orport()Nick Mathewson
For whatever reason, clang's scan-build isn't sure that this function actually initializes its output.
2018-04-17Fix a copy-and-paste error from 6be994fa717cf73Nick Mathewson
Found by clang's scan-build too. Bug not in any released Tor.
2018-04-17Fixup timing wheel warnings related to recent WHEEL_BIT change.Nick Mathewson
2018-04-17token bucket: Add parens to rate_per_sec_to_rate_per_step()Nick Mathewson
Typecasts bind more tightly than division, so we need to do the division first.
2018-04-17Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-17Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-17Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-17Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-17Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-17heartbeat: Log the number of circuits killed because too many cellsDavid Goulet
We recently merged a circuit cell queue size safeguard. This commit adds the number of killed circuits that have reached the limit to the DoS heartbeat. It now looks like this: [notice] DoS mitigation since startup: 0 circuits killed with too many cells. 0 circuits rejected, 0 marked addresses. 0 connections closed. 0 single hop clients refused. Second thing that this patch does. It makes tor always print the DoS mitigation heartbeat line (for a relay) even though no DoS mitigation have been enabled. The reason is because we now kill circuits that have too many cells regardless on if it is enabled or not but also it will give the operator a chance to learn what is enabled with the heartbeat instead of suddenly appearing when it is enabled by let say the consensus. Fixes #25824 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-17Merge remote-tracking branch 'public/bug24688'Nick Mathewson
2018-04-16token: Fix uint32_t to uint64_t conversionDavid Goulet
Unfortunately, the units passed to monotime_coarse_stamp_units_to_approx_msec() was always 0 due to a type conversion. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-16Add support for the coveralls.io coverage tool in travis configNick Mathewson
Closes ticket 25818.
2018-04-16Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-16Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-16Fix an LCOV exclusion pattern in address.cNick Mathewson
2018-04-16Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-16Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3Nick Mathewson
2018-04-16relay: Implement a circuit cell queue maximum sizeDavid Goulet
This commit introduces the consensus parameter "circ_max_cell_queue_size" which controls the maximum number of cells a circuit queue should have. The default value is currently 50000 cells which is above what should be expected but keeps us a margin of error for padding cells. Related to this is #9072. Back in 0.2.4.14-alpha, we've removed that limit due to a Guard discovery attack. Ticket #25226 details why we are putting back the limit due to the memory pressure issue on relays. Fixes #25226 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-16Remove old tor-fw-helper README from EXTRA_DISTNick Mathewson
We removed this file, but didn't take it out of EXTRA_DIST -- thus breaking "make dist".
2018-04-15Merge branch 'maint-0.3.3'Nick Mathewson
"ours" to avoid version bump.
2018-04-15bump to 0.3.3.5-rc-devNick Mathewson
2018-04-15copy 0.3.3.5-rc changelog to master.Nick Mathewson
2018-04-14Remove changes files that will appear in 0.3.3.5-rc.Nick Mathewson
2018-04-14Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-14bump to 0.3.3.5-rcNick Mathewson
2018-04-1332-bit compilation warningsNick Mathewson
2018-04-13token_bucket: Fix indentationDavid Goulet
Both header and code file had some indentation issues after mass renaming. No code behavior change. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-13Merge branch 'token_bucket_once_again_squashed'Nick Mathewson
2018-04-13Fix "make check-spaces"Nick Mathewson
2018-04-13Refactor "timestamp" not to be its own type coupled to token buffersNick Mathewson
Really, the uint32_t is only an optimization; any kind of unit should work fine. Some users might want to use time_t or monotime_coarse_t or something like that.
2018-04-13Move token_bucket_raw_* functions to the start of the module.Nick Mathewson
(These functions were previously helper functions for token_bucket_rw_t).
2018-04-13Never pick a rate of 0.Nick Mathewson
(The tests caught this one.)
2018-04-13Start re-refactoring the token bucket interface.Nick Mathewson
Begin by creating a lowest-level triple of the types needed to implement a token bucket: a configuration, a timestamp, and the raw bucket itself. Note that for low-level buckets, the units of the timestamp and the bucket itself are unspecified: each user can use a different type. (This patch breaks check-spaces; a later patch will fix it)
2018-04-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-13Merge remote-tracking branch 'dgoulet/ticket25248_033_02' into maint-0.3.3Nick Mathewson
2018-04-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-04-13doc: Fix typo and clarify that DoS options are relay onlyMike Perry
2018-04-13doc: Move DOS options below SERVER optionsDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-13doc: Improve DoS section of the man page tor.1David Goulet
Add to the Denial of Service section of the man page an explanation about the three different mitigation Tor has. Fixes #25248. Signed-off-by: David Goulet <dgoulet@torproject.org>