summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-07-14Merge branch 'bug22916_027' into maint-0.2.9Nick Mathewson
2017-07-13Fix compiler warnings with openssl-scrypt/libscrypt test on clangNick Mathewson
Clang didn't like that we were passing uint64_t values to an API that wanted uint32_t. GCC has either not cared, or has figured out that the values in question were safe to cast to uint32_t. Fixes bug22916; bugfix on 0.2.7.2-alpha.
2017-07-07Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-07-07mingw fix: avoid "unused var" warning.Nick Mathewson
This is a backport of 19615bce64cd381a925bc3910120ac39ca918e7c to fix bug 22838.
2017-07-05Only disable -Wfloat-conversion on mingw when it exists.Nick Mathewson
The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor.
2017-07-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-07-05Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-07-05Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-07-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-07-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-07-05Merge branch 'bug22801_028' into maint-0.2.9Nick Mathewson
2017-07-03Fix assertion failure related to openbsd strtol().Nick Mathewson
Fixes bug 22789; bugfix on 0.2.3.8-alpha.
2017-07-03Fix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64.Nick Mathewson
We just have to suppress these warnings: Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. Fixes bug 22801; bugfix on 0.2.8.1-alpha.
2017-06-28Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9Nick 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 'maint-0.2.8' into maint-0.2.9Nick 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-16Permit the fchmod system call.Nick Mathewson
Fixes bug 22516; bugfix on 0.2.5.4-alpha.
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-08Add -dev to version number.Nick Mathewson
2017-06-08Add -dev to version number.Nick Mathewson
2017-06-08Add -dev to version number.Nick Mathewson
2017-06-08Add -dev to version number.Nick Mathewson
2017-06-08Add -dev to version number.Nick Mathewson
2017-06-08Add -dev to version number.Nick Mathewson
2017-06-08Bump to 0.2.8.14Nick Mathewson
2017-06-08Bump to 0.2.7.8Nick Mathewson
2017-06-08Bump to 0.2.6.12Nick Mathewson
2017-06-08bump to 0.2.5.14Nick Mathewson
2017-06-08Bump to 0.2.4.29Nick Mathewson
2017-06-08bump to 0.2.9.11Nick 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
2017-06-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-08TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cellDavid Goulet
On an hidden service rendezvous circuit, a BEGIN_DIR could be sent (maliciously) which would trigger a tor_assert() because connection_edge_process_relay_cell() thought that the circuit is an or_circuit_t but is an origin circuit in reality. Fixes #22494 Reported-by: Roger Dingledine <arma@torproject.org> Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-05Rename "link" variable to avoid shadowing warning.Nick Mathewson
2017-06-05Merge branch 'bug22460_case2_029_01_squashed' into maint-0.2.9Nick Mathewson
2017-06-05Improve documentation on get_{peer,own}_certificate()Nick Mathewson
Make it clear that we're returning a newly allocated copy.
2017-06-05Repair link_handshake unit tests to mock tor_tls_get_own_cert()Nick Mathewson
The tests previously assumed that the link handshake code would be calling get_my_certs() -- when I changed it to call get_own_cert() instead for the (case 2) 22460 fix, the tests failed, since the tls connection wasn't really there. This change makes us start mocking out the tor_tls_get_own_cert() function too. It also corrects the behavior of the mock_get_peer_cert() function -- it should have been returning a newly allocated copy.