summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-08copy changelog to releasenotestor-0.3.0.8Nick Mathewson
2017-06-08Fold TROVE-2017-00[45] into changelogNick Mathewson
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
"ours" merge to avoid version bump.
2017-06-08Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
"ours" merge to avoid version bump.
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-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-08bump to 0.3.0.8Nick Mathewson
2017-06-08Merge branch 'maint-0.3.0' into release-0.3.0Nick 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-08Merge branch 'maint-0.2.9' into maint-0.3.0Nick 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-08Another changes fix.Nick Mathewson
2017-06-08Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-08tweak changes file.Nick Mathewson
2017-06-08TROVE-2017-004: Fix assertion failure in relay_send_end_cell_from_edge_David Goulet
This fixes an assertion failure in relay_send_end_cell_from_edge_() when an origin circuit and a cpath_layer = NULL were passed. A service rendezvous circuit could do such a thing when a malformed BEGIN cell is received but shouldn't in the first place because the service needs to send an END cell on the circuit for which it can not do without a cpath_layer. Fixes #22493 Reported-by: Roger Dingledine <arma@torproject.org> Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-08Start on an 0.3.0.8 changelogNick Mathewson
2017-06-06Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-06Repair the unit test behavior of my fix for 22508.Nick Mathewson
Apparently, the unit tests relied on being able to make ed->x509 link certs even when they hadn't set any server flags in the options. So instead of making "client" mean "never generate an ed->x509 cert", we'll have it mean "it's okay not to generate an ed->x509 cert". (Going with a minimal fix here, since this is supposed to be a stable version.)
2017-06-06Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-06Make generate_ed_link_cert() a no-op on clients.Nick Mathewson
Fixes bug 22508; bug not in any released Tor.
2017-06-05Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-05Rename "link" variable to avoid shadowing warning.Nick Mathewson
2017-06-05Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-05Fix unit tests to work after own_link_cert assertionNick Mathewson
The assert_nonfatal() I had added was triggered by some of the code that tested the pre-ed case of CERTS cell generation.
2017-06-05Merge branch 'bug22460_030_01' into maint-0.3.0Nick Mathewson
2017-06-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick 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-05Changes file for the x509 link certificate case of bug22460Nick Mathewson
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.
2017-06-05Test prerequisites: function to dup a cert, make get_own_cert mockable.Nick Mathewson
2017-06-05On v3 link handshake, send the correct link certificateNick Mathewson
Previously we'd send the _current_ link certificate, which would cause a handshaking failure when the TLS context rotated.
2017-06-05Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-06-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-05Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion