Nick Mathewson
c1646d6e89
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-08 09:21:15 -04:00
Nick Mathewson
40bccc2004
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-08 09:21:15 -04:00
Nick Mathewson
dec7998f5c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-08 09:21:15 -04:00
Nick Mathewson
987c7cae70
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-08 09:21:15 -04:00
Nick Mathewson
53011e3e54
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-08 09:21:15 -04:00
Nick Mathewson
83135d75a3
Merge branch 'maint-0.3.0'
2017-06-08 09:21:15 -04:00
David Goulet
56a7c5bc15
TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cell
...
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-08 09:21:10 -04:00
Nick Mathewson
eb5d05f696
Another changes fix.
2017-06-08 09:20:53 -04:00
Nick Mathewson
9acca04025
Merge branch 'maint-0.3.0'
2017-06-08 09:17:32 -04:00
Nick Mathewson
0c46dc8097
tweak changes file.
2017-06-08 09:16:33 -04:00
David Goulet
79b59a2dfc
TROVE-2017-004: Fix assertion failure in relay_send_end_cell_from_edge_
...
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-08 09:14:10 -04:00
Nick Mathewson
5955b63a9a
Start on a changelog for 0.3.1.3-alpha
2017-06-07 09:36:12 -04:00
Nick Mathewson
9ab45d621c
Merge branch 'maint-0.3.0'
2017-06-06 11:34:11 -04:00
Nick Mathewson
68c3df69de
Repair the unit test behavior of my fix for 22508.
...
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-06 11:32:01 -04:00
Nick Mathewson
14ffcc003d
Merge branch 'maint-0.3.0'
2017-06-06 09:32:45 -04:00
Nick Mathewson
4ed0f0d62f
Make generate_ed_link_cert() a no-op on clients.
...
Fixes bug 22508; bug not in any released Tor.
2017-06-06 09:32:11 -04:00
Nick Mathewson
5343d2b03c
Merge branch 'maint-0.3.0'
2017-06-05 16:35:40 -04:00
Nick Mathewson
ac1ddd5e5b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 16:35:40 -04:00
Nick Mathewson
d561da10dd
Rename "link" variable to avoid shadowing warning.
2017-06-05 16:35:37 -04:00
Nick Mathewson
e3b1573be6
Merge branch 'maint-0.3.0'
2017-06-05 15:52:06 -04:00
Nick Mathewson
91f49bc0f0
Fix unit tests to work after own_link_cert assertion
...
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-05 15:51:11 -04:00
Nick Mathewson
d5acdadaef
Merge branch 'bug22460_030_01' into maint-0.3.0
2017-06-05 15:44:36 -04:00
Nick Mathewson
d1c1dc229e
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 15:44:12 -04:00
Nick Mathewson
9fea00928c
Merge branch 'bug22460_case2_029_01_squashed' into maint-0.2.9
2017-06-05 15:28:13 -04:00
Nick Mathewson
ec84fc1d8e
Improve documentation on get_{peer,own}_certificate()
...
Make it clear that we're returning a newly allocated copy.
2017-06-05 15:27:33 -04:00
Nick Mathewson
01878fa309
Changes file for the x509 link certificate case of bug22460
2017-06-05 15:27:33 -04:00
Nick Mathewson
8e9392c267
Repair link_handshake unit tests to mock tor_tls_get_own_cert()
...
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-05 15:27:33 -04:00
Nick Mathewson
39b7e89c28
Test prerequisites: function to dup a cert, make get_own_cert mockable.
2017-06-05 15:27:33 -04:00
Nick Mathewson
50facb40bb
On v3 link handshake, send the correct link certificate
...
Previously we'd send the _current_ link certificate, which would
cause a handshaking failure when the TLS context rotated.
2017-06-05 15:27:33 -04:00
Nick Mathewson
dd573f72b2
Merge branch 'maint-0.3.0'
2017-06-05 14:49:46 -04:00
Nick Mathewson
7c54d2f3f0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 14:49:46 -04:00
Nick Mathewson
80aca1501a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-05 14:49:46 -04:00
Nick Mathewson
d850d27369
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-05 14:48:30 -04:00
Nick Mathewson
9a6f938582
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-05 14:48:30 -04:00
Nick Mathewson
a56cfdaba2
Merge branch 'maint-0.2.5' into maint-0.2.6
...
Ours merge to avoid taking 4ee48cb434
2017-06-05 14:39:06 -04:00
Nick Mathewson
2e5220cb8b
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-05 14:38:54 -04:00
Nick Mathewson
4ee48cb434
Fix C89 warning (since Tor 0.2.4-5 still care about that.)
2017-06-05 14:38:38 -04:00
Nick Mathewson
db2f18b1f9
Merge branch 'maint-0.3.0'
2017-06-05 12:02:47 -04:00
Nick Mathewson
578a4392e9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 12:02:26 -04:00
Nick Mathewson
d75be189df
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-06-05 12:02:15 -04:00
Nick Mathewson
33fcc0f61d
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-05 12:01:17 -04:00
Nick Mathewson
3f2d1f7f07
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-05 12:00:41 -04:00
Nick Mathewson
9ea3d0877a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-05 12:00:27 -04:00
Nick Mathewson
1a540b5792
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-05 12:00:08 -04:00
Nick Mathewson
e3ebae4804
Fix undefined behavior in geoip_parse_entry().
...
Fixes bug 22490; bugfix on 6a241ff3ff
2017-06-05 10:09:39 -04:00
Nick Mathewson
26d9fffae4
Merge branch 'bug22466_diagnostic_030'
2017-06-05 09:52:09 -04:00
Nick Mathewson
be741d7e63
Merge branch 'maint-0.3.0'
2017-06-05 09:51:57 -04:00
Nick Mathewson
e5bdfd66cf
Make code more clear about own_link_cert safety
...
It's okay to call add_ed25519_cert with a NULL argument: so,
document that. Also, add a tor_assert_nonfatal() to catch any case
where we have failed to set own_link_cert when conn_in_server_mode.
2017-06-05 09:35:55 -04:00
Nick Mathewson
41ed9e978b
Regenerate RSA->ed25519 identity crosscertificate as needed
2017-06-01 10:04:52 -04:00
Nick Mathewson
f2068ef862
Use tor_assert_nonfatal() to try to detect #22466
2017-06-01 09:42:32 -04:00
