8e8abbbbee
Fix the expected bug warning in dir/param_voting_lookup tests
2017-07-07 13:06:02 -04:00
c7d2a67274
Fix a couple of clang warnings
2017-07-07 11:32:15 -04:00
c387cc5022
Merge branch 'ticket21859_032_01_squashed'
2017-07-07 11:17:53 -04:00
6a64563b1d
Fix wide lines
2017-07-07 11:15:27 -04:00
f35f52e869
Hide crypto_digest_t again and use an accessor for tests.
2017-07-07 11:12:27 -04:00
70d08f764d
Explicit length checks in create_rend_cpath().
...
Had to also edit hs_ntor_circuit_key_expansion() to make it happen.
2017-07-07 11:12:27 -04:00
9bccc04f8d
test: Add service-side unittests for e2e rendezvous circuits.
2017-07-07 11:12:26 -04:00
173dd486e3
test: Add client-side unittests for e2e rend circuits.
2017-07-07 11:12:26 -04:00
dc3a2037f5
test: Move some test code to test helpers.
...
Move code to create connection streams and rend_data structures to
test_helpers so that we can use them from the e2e rendezvous circuit
unittests.
2017-07-07 11:12:26 -04:00
15fddaffd5
Merge branch 'maint-0.3.1'
2017-07-05 13:43:31 -04:00
5434b2451e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 13:43:31 -04:00
546f5b364b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 13:43:31 -04:00
32c0066e4b
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-05 13:43:21 -04:00
5ff0f1ab9e
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-05 13:42:47 -04:00
6cd6d488dc
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-05 13:42:37 -04:00
f6420bceec
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-05 13:42:32 -04:00
ff8c230d7c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-05 13:42:26 -04:00
cd77ea782e
Merge branch 'neena-fix-1667'
2017-07-05 11:01:36 -04:00
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
17bd118b4c
Add test that parses a hardcoded v2 descriptor.
2017-07-05 10:14:26 -04:00
bb3f74e66b
Fix assertion failure related to openbsd strtol().
...
Fixes bug 22789; bugfix on 0.2.3.8-alpha.
2017-07-03 11:22:27 -04:00
71b9f4f0bb
Merge branch 'maint-0.3.1'
2017-06-29 15:57:49 -04:00
1712dc98b0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-29 15:57:48 -04:00
88666d0482
Adjust unit tests to account for fix to bug 22753.
...
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-29 10:11:21 -04:00
f85c1874ad
ed25519: Add tests blinding bad ed25519 pubkeys.
2017-06-28 16:02:21 +03:00
c0f0351e06
whitespace fix
2017-06-27 17:22:53 -04:00
7fff6cfead
Merge branch 'asn_bug22006_final_squashed'
2017-06-27 17:19:08 -04:00
e8eee3a50e
ed25519: Add unittests for ed25519 pubkey validation.
2017-06-27 17:17:58 -04:00
f6df433b91
Merge branch 'maint-0.3.1'
2017-06-26 14:30:21 -04:00
32596016a2
Merge branch 'bug22105_031' into maint-0.3.1
2017-06-26 14:30:17 -04:00
06414b9922
Merge branch 'maint-0.3.1'
2017-06-26 11:39:43 -04:00
0592ee45fc
Demote a log message due to libevent delays.
...
This is a side-effect of being single-threaded. The worst cases of this are
actually Bug #16585 .
2017-06-26 11:26:59 -04:00
34ecfeb479
whitespace fix
2017-06-22 08:16:48 -04:00
b9d8c8b126
Merge remote-tracking branch 'rl1987/bug22461'
2017-06-22 08:11:36 -04:00
3a8a92fddd
Merge branch 'callgraph_reduction_v2'
2017-06-21 16:47:55 -04:00
1c0a2335cd
Extract channel_do_open_actions() from non-open _change_state cases
...
This reduces the size of the largest SCC in the callgraph by 30
functions, from 58 to 28.
2017-06-21 14:03:00 -04:00
6595f55020
unit tests for peek_buf_startswith()
2017-06-21 11:20:33 -04:00
94a1b8b66c
Add a unit test for decompressing concatenated inputs.
2017-06-20 10:21:35 -04:00
1721487bea
Remove hardwired libfuzzer path; closes 22105.
2017-06-19 15:35:46 -04:00
5343d2b03c
Merge branch 'maint-0.3.0'
2017-06-05 16:35:40 -04:00
ac1ddd5e5b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 16:35:40 -04:00
d561da10dd
Rename "link" variable to avoid shadowing warning.
2017-06-05 16:35:37 -04:00
e3b1573be6
Merge branch 'maint-0.3.0'
2017-06-05 15:52:06 -04:00
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
d5acdadaef
Merge branch 'bug22460_030_01' into maint-0.3.0
2017-06-05 15:44:36 -04:00
d1c1dc229e
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-05 15:44:12 -04:00
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
7f05f89663
Don't reject SOCKS5 requests that contain IP strings
2017-06-04 13:14:55 +02:00
34a6755b94
Fix ed25519 link certificate race on tls context rotation
...
Whenever we rotate our TLS context, we change our Ed25519
Signing->Link certificate. But if we've already started a TLS
connection, then we've already sent the old X509 link certificate,
so the new Ed25519 Signing->Link certificate won't match it.
To fix this, we now store a copy of the Signing->Link certificate
when we initialize the handshake state, and send that certificate
as part of our CERTS cell.
Fixes one case of bug22460; bugfix on 0.3.0.1-alpha.
2017-06-01 09:26:24 -04:00
a9be768959
Bugfix: Regenerate more certificates when appropriate
...
Previously we could sometimes change our signing key, but not
regenerate the certificates (signing->link and signing->auth) that
were signed with it. Also, we would regularly replace our TLS x.509
link certificate (by rotating our TLS context) but not replace our
signing->link ed25519 certificate. In both cases, the resulting
inconsistency would make other relays reject our link handshakes.
Fixes two cases of bug 22460; bugfix on 0.3.0.1-alpha.
2017-05-31 18:45:35 -04:00
Nick Mathewson
George Kadianakis
Mike Perry
rl1987