Nick Mathewson
bb35405d2a
Fix a copy-paste error in the fix for #23693 .
...
Found by coverity; CID 25912; bug not in any released Tor.
2018-04-25 08:00:55 -04:00
Nick Mathewson
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
Nick Mathewson
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
Nick Mathewson
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
9727b4c5d6
Merge branch 'bug24969_029_v2' into maint-0.2.9
2018-04-23 09:23:25 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
c3e40a8361
Allow cpuworkers to exist without onion keys
...
Now that we allow cpuworkers for dirport-only hosts (to fix 23693),
we need to allow dup_onion_keys() to succeed for them.
The change to construct_ntor_key_map() is for correctness,
but is not strictly necessary.
2018-04-22 17:17:07 -04:00
Nick Mathewson
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
Nick Mathewson
ce8e7427b9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-17 10:48:08 -04:00
Nick Mathewson
d3ff126309
Add support for the coveralls.io coverage tool in travis config
...
Closes ticket 25818.
2018-04-16 14:42:28 -04:00
Nick Mathewson
5e0fbd7006
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-16 13:48:23 -04:00
Nick Mathewson
0e13ff4815
Fix an LCOV exclusion pattern in address.c
2018-04-16 13:48:21 -04:00
Nick Mathewson
386f8016b7
Fix another crash-on-no-threadpool bug.
...
This one happens if for some reason you start with DirPort enabled
but server mode turned off entirely.
Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha.
2018-04-10 14:44:38 -04:00
Nick Mathewson
db6902c235
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-10 14:26:29 -04:00
Nick Mathewson
10a1969ca3
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
2018-04-10 14:25:57 -04:00
Alexander Færøy
1295044dc8
Lift the list of default directory servers into their own file.
...
This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.
Patch by beastr0.
See: https://bugs.torproject.org/24854
2018-04-09 16:00:26 +02:00
Taylor Yu
e813116d3d
Switch Travis to stable rust
2018-04-05 08:36:09 -04:00
Nick Mathewson
834eef2452
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-05 08:22:34 -04:00
Nick Mathewson
b68e636b33
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-04-05 08:22:33 -04:00
Karsten Loesing
1fa396b0a4
Update geoip and geoip6 to the April 3 2018 database.
2018-04-05 10:42:25 +02:00
Nick Mathewson
5acfc30876
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-27 18:23:53 -04:00
Taylor Yu
4bb7d9fd12
Fix CID 1430932
...
Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27 15:29:00 -05:00
Nick Mathewson
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
Nick Mathewson
9f93bcd16d
Remove sb_poll check: all poll() calls are ok.
2018-03-20 08:30:21 -04:00
Nick Mathewson
070eda5a21
Add the poll() syscall as permitted by the sandbox
...
Apparently, sometimes getpwnam will call this.
Fixes bug 25513.
2018-03-20 08:23:44 -04:00
Nick Mathewson
1aa0ae2cc3
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-19 05:42:43 -04:00
Nick Mathewson
3370b3cfef
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-19 05:42:43 -04:00
Nick Mathewson
0eb2cdf99d
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
2018-03-19 05:42:38 -04:00
Nick Mathewson
0e7f15fdb6
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-13 10:58:02 -04:00
Nick Mathewson
67a313f0ec
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-13 10:58:02 -04:00
Karsten Loesing
3418a3a7f0
Update geoip and geoip6 to the March 8 2018 database.
2018-03-13 10:57:49 -04:00
Nick Mathewson
0aa794d309
version bump to 0.3.1.10-dev
2018-03-03 11:32:51 -05:00
Nick Mathewson
2e2aacca2a
Merge branch 'maint-0.2.9' into maint-0.3.1
...
"ours" merge to avoid version bump.
2018-03-03 11:32:29 -05:00
Nick Mathewson
9eb6f9d3c8
Bump version to 0.2.9.15-dev
2018-03-03 11:32:16 -05:00
Nick Mathewson
c527a8a9c9
Update to 0.3.1.10
2018-03-01 16:43:01 -05:00
Nick Mathewson
805a785780
Merge branch 'maint-0.2.9' into maint-0.3.1
...
"ours" merge to avoid version bump.
2018-03-01 16:42:25 -05:00
Nick Mathewson
35753c0774
version bump to 0.2.9.15
2018-03-01 16:42:17 -05:00
Nick Mathewson
d4a758e083
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-01 16:07:59 -05:00
Nick Mathewson
c1bb8836ff
Protover tests: disable some obsoleted tests
...
These were meant to demonstrate old behavior, or old rust behavior.
One of them _should_ work in Rust, but won't because of
implementation details. We'll fix that up later.
2018-03-01 16:05:17 -05:00
Nick Mathewson
c5295cc1be
Spec conformance on protover: always reject ranges where lo>hi
2018-03-01 16:05:17 -05:00
Nick Mathewson
1fe0bae508
Forbid UINT32_MAX as a protocol version
...
The C code and the rust code had different separate integer overflow
bugs here. That suggests that we're better off just forbidding this
pathological case.
Also, add tests for expected behavior on receiving a bad protocol
list in a consensus.
Fixes another part of 25249.
2018-03-01 16:05:17 -05:00
Nick Mathewson
8b405c609e
Forbid "-0" as a protocol version.
...
Fixes part of 24249; bugfix on 0.2.9.4-alpha.
2018-03-01 16:05:17 -05:00
Nick Mathewson
0953c43c95
Add more of Teor's protover tests.
...
These are as Teor wrote them; I've disabled the ones that don't pass
yet, with XXXX comments.
2018-03-01 16:05:17 -05:00
Nick Mathewson
d3a1bdbf56
Add some protover vote round-trip tests from Teor.
...
I've refactored these to be a separate function, to avoid tricky
merge conflicts.
Some of these are disabled with "XXXX" comments; they should get
fixed moving forward.
2018-03-01 16:05:17 -05:00
Nick Mathewson
a83650852d
Add another NULL-pointer fix for protover.c.
...
This one can only be exploited if you can generate a correctly
signed consensus, so it's not as bad as 25074.
Fixes bug 25251; also tracked as TROVE-2018-004.
2018-03-01 16:05:17 -05:00
Nick Mathewson
65f2eec694
Correctly handle NULL returns from parse_protocol_list when voting.
...
In some cases we had checked for it, but in others we had not. One
of these cases could have been used to remotely cause
denial-of-service against directory authorities while they attempted
to vote.
Fixes TROVE-2018-001.
2018-03-01 16:05:17 -05:00
Taylor Yu
09484b9449
Document how to allow partial Travis failures
...
Add some commented-out allow_failures clauses to make it easier to
temporarily allow less-critical sub-builds to fail while still
reporting success.
2018-03-01 13:18:33 -06:00
Nick Mathewson
ac1942ac58
Update the .gitmodules to refer to project-level tor-rust-dependencies
...
Closes most of #25323 .
2018-02-21 11:53:04 -05:00
Nick Mathewson
2bcd264a28
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-16 09:48:11 -05:00