summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-29add a missing backport notetor-0.3.0.9Nick Mathewson
2017-06-29Add changelog entries for 0.3.0.9, copied from 0.3.1.x changelogsNick Mathewson
2017-06-29Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-29Update maint-0.3.0 to 0.3.0.9Nick Mathewson
2017-06-29Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-29Merge branch 'trove-2017-006' into maint-0.3.0Nick Mathewson
2017-06-29Adjust unit tests to account for fix to bug 22753.Nick Mathewson
Our mock network put all the guards on the same IPv4 address, which doesn't fly when we start applying EnforceDistinctSubnets. So in this commit, I disable EnforceDistinctSubnets when running the old guard_restriction_t test. This commit also adds a regression test for #22753.
2017-06-29Consider the exit family when applying guard restrictions.Nick Mathewson
When the new path selection logic went into place, I accidentally dropped the code that considered the _family_ of the exit node when deciding if the guard was usable, and we didn't catch that during code review. This patch makes the guard_restriction_t code consider the exit family as well, and adds some (hopefully redundant) checks for the case where we lack a node_t for a guard but we have a bridge_info_t for it. Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006 and CVE-2017-0377.
2017-06-28Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9Nick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9Nick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-28whitespace fixNick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-28Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-27Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-27Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-27Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-27Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-27Merge branch 'bug22737_024' into maint-0.2.4Nick Mathewson
2017-06-27Fix an errant memset() into the middle of a struct in cell_pack().Nick Mathewson
This mistake causes two possible bugs. I believe they are both harmless IRL. BUG 1: memory stomping When we call the memset, we are overwriting two 0 bytes past the end of packed_cell_t.body. But I think that's harmless in practice, because the definition of packed_cell_t is: // ... typedef struct packed_cell_t { TOR_SIMPLEQ_ENTRY(packed_cell_t) next; char body[CELL_MAX_NETWORK_SIZE]; uint32_t inserted_time; } packed_cell_t; So we will overwrite either two bytes of inserted_time, or two bytes of padding, depending on how the platform handles alignment. If we're overwriting padding, that's safe. If we are overwriting the inserted_time field, that's also safe: In every case where we call cell_pack() from connection_or.c, we ignore the inserted_time field. When we call cell_pack() from relay.c, we don't set or use inserted_time until right after we have called cell_pack(). SO I believe we're safe in that case too. BUG 2: memory exposure The original reason for this memset was to avoid the possibility of accidentally leaking uninitialized ram to the network. Now remember, if wide_circ_ids is false on a connection, we shouldn't actually be sending more than 512 bytes of packed_cell_t.body, so these two bytes can only leak to the network if there is another bug somewhere else in the code that sends more data than is correct. Fortunately, in relay.c, where we allocate packed_cell_t in packed_cell_new() , we allocate it with tor_malloc_zero(), which clears the RAM, right before we call cell_pack. So those packed_cell_t.body bytes can't leak any information. That leaves the two calls to cell_pack() in connection_or.c, which use stack-alocated packed_cell_t instances. In or_handshake_state_record_cell(), we pass the cell's contents to crypto_digest_add_bytes(). When we do so, we get the number of bytes to pass using the same setting of wide_circ_ids as we passed to cell_pack(). So I believe that's safe. In connection_or_write_cell_to_buf(), we also use the same setting of wide_circ_ids in both calls. So I believe that's safe too. I introduced this bug with 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2 back in 0.2.4.11-alpha; it is bug 22737 and CID 1401591
2017-06-22Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-22Combine our "don't do this if no consensus" entryguards checksNick Mathewson
Suggested by asn on 22400 review.
2017-06-19Don't expand guard sample set unless consensus is "reasonably live"Nick Mathewson
Fixes what I think is the main root cause of 22400. Bugfix on 0.3.0.1-alpha.
2017-06-19Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-19Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-19Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9Nick Mathewson
2017-06-16Permit the fchmod system call.Nick Mathewson
Fixes bug 22516; bugfix on 0.2.5.4-alpha.
2017-06-09Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-09Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-09Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-09Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-09Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-09Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-09Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-09Update geoip and geoip6 to the June 8 2017 database.Karsten Loesing
2017-06-08Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-08Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
"ours" merge to avoid version bump.
2017-06-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-08Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-08Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
"ours" merge to avoid version bump.
2017-06-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
"ours" merge to avoid version bump.
2017-06-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
"ours" merge to avoid version bump.
2017-06-08Add -dev to version number.Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion