]>
git.ipfire.org Git - thirdparty/tor.git/log
Isis Lovecruft [Wed, 12 Jul 2017 02:47:43 +0000 (02:47 +0000)]
Add changes file for #19476.
Isis Lovecruft [Wed, 12 Jul 2017 02:40:24 +0000 (02:40 +0000)]
If writing a heartbeat message fails, retry after MIN_HEARTBEAT_PERIOD.
* FIXES #19476.
cypherpunks [Tue, 21 Jun 2016 13:03:38 +0000 (13:03 +0000)]
Use the return value for choosing intervals
Nick Mathewson [Mon, 10 Jul 2017 19:27:16 +0000 (15:27 -0400)]
Merge branch 'maint-0.3.1'
Matt Traudt [Mon, 10 Jul 2017 16:19:33 +0000 (12:19 -0400)]
Make consdiff tests pass on OS X too
Matt Traudt [Mon, 10 Jul 2017 18:02:11 +0000 (14:02 -0400)]
Add more details about git branch use in tor
Nick Mathewson [Mon, 10 Jul 2017 14:03:45 +0000 (10:03 -0400)]
impact -> affect
Nick Mathewson [Mon, 10 Jul 2017 14:03:22 +0000 (10:03 -0400)]
Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'
Nick Mathewson [Mon, 10 Jul 2017 13:28:50 +0000 (09:28 -0400)]
Avoid double-typedef errors on freebsd.
Chelsea H. Komlo [Sun, 9 Jul 2017 20:17:21 +0000 (16:17 -0400)]
specify when to run make distcheck
Nick Mathewson [Fri, 7 Jul 2017 17:28:22 +0000 (13:28 -0400)]
Merge branch 'bug17750_029_squashed'
teor [Tue, 4 Jul 2017 15:45:28 +0000 (01:45 +1000)]
Comment that failure schedules always use exponential backoff
teor [Tue, 4 Jul 2017 15:32:06 +0000 (01:32 +1000)]
Refactor exponential backoff multipliers into macros
There are only so many times you can type "4".
teor [Tue, 4 Jul 2017 15:31:23 +0000 (01:31 +1000)]
Add regression tests for 17750 and 20534
teor [Tue, 4 Jul 2017 15:29:35 +0000 (01:29 +1000)]
Use download_status_get_next_attempt_at() more often
This guards against future occurrences of 17750.
teor [Tue, 4 Jul 2017 15:27:17 +0000 (01:27 +1000)]
Give correct bounds in next_random_exponential_delay() comment
teor [Fri, 26 May 2017 06:16:37 +0000 (16:16 +1000)]
Make clients try fallbacks before authorities
Make clients wait for 6 seconds before trying to download their
consensus from an authority.
Fixes bug 17750, bugfix on 0.2.8.1-alpha.
Nick Mathewson [Fri, 7 Jul 2017 17:06:02 +0000 (13:06 -0400)]
Fix the expected bug warning in dir/param_voting_lookup tests
Nick Mathewson [Fri, 7 Jul 2017 17:03:36 +0000 (13:03 -0400)]
Merge branch 'bug21495'
Nick Mathewson [Fri, 7 Jul 2017 15:32:15 +0000 (11:32 -0400)]
Fix a couple of clang warnings
Nick Mathewson [Fri, 7 Jul 2017 15:17:53 +0000 (11:17 -0400)]
Merge branch 'ticket21859_032_01_squashed'
Nick Mathewson [Fri, 7 Jul 2017 15:15:27 +0000 (11:15 -0400)]
Fix wide lines
Nick Mathewson [Fri, 7 Jul 2017 15:14:47 +0000 (11:14 -0400)]
Use LD_BUG, not LOG_PROTOCOL_WARN, for bad-purpose cases.
George Kadianakis [Thu, 6 Jul 2017 13:39:48 +0000 (16:39 +0300)]
Hide crypto_digest_t again and use an accessor for tests.
George Kadianakis [Thu, 6 Jul 2017 13:23:30 +0000 (16:23 +0300)]
Explicit length checks in create_rend_cpath().
Had to also edit hs_ntor_circuit_key_expansion() to make it happen.
George Kadianakis [Thu, 6 Jul 2017 11:15:23 +0000 (14:15 +0300)]
Explicit length checks in circuit_init_cpath_crypto().
George Kadianakis [Thu, 6 Jul 2017 10:53:08 +0000 (13:53 +0300)]
Rename get_rend_cpath() to create_rend_cpath().
based on Nick's review.
George Kadianakis [Thu, 6 Jul 2017 10:51:06 +0000 (13:51 +0300)]
Rename rend_circuit_validate_purpose() based on Nick's review.
George Kadianakis [Thu, 6 Jul 2017 10:50:16 +0000 (13:50 +0300)]
Turn some warnings into bugs and non-fatal asserts.
George Kadianakis [Thu, 6 Jul 2017 10:37:55 +0000 (13:37 +0300)]
Improve docs based on Nick's review.
George Kadianakis [Tue, 2 May 2017 13:37:17 +0000 (16:37 +0300)]
test: Add service-side unittests for e2e rendezvous circuits.
George Kadianakis [Tue, 2 May 2017 13:36:59 +0000 (16:36 +0300)]
test: Add client-side unittests for e2e rend circuits.
George Kadianakis [Tue, 2 May 2017 13:35:22 +0000 (16:35 +0300)]
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.
George Kadianakis [Tue, 2 May 2017 13:33:49 +0000 (16:33 +0300)]
test: Crypto groundwork for e2e circuit unittests.
- Move some crypto structures so that they are visible by tests.
- Introduce a func to count number of hops in cpath which will be used
by the tests.
- Mark a function as mockable.
George Kadianakis [Tue, 2 May 2017 13:22:00 +0000 (16:22 +0300)]
test: Introduce hs_client_note_connection_attempt_succeeded().
This commit paves the way for the e2e circuit unittests.
Add a stub for the prop224 equivalent of rend_client_note_connection_attempt_ended().
That function was needed for tests, since the legacy function would get
called when we attach streams and our client-side tests would crash with
assert failures on rend_data.
This also introduces hs_client.[ch] to the codebase.
David Goulet [Fri, 12 May 2017 16:00:43 +0000 (12:00 -0400)]
prop224: Introduce e2e rendezvous circuit code.
This commit adds most of the work of #21859. It introduces hs_circuit.c
functions that can handle the setup of e2e circuits for prop224 hidden
services, and also for legacy hidden service clients. Entry points are:
prop224 circuits: hs_circuit_setup_e2e_rend_circ()
legacy client-side circuits: hs_circuit_setup_e2e_rend_circ_legacy_client()
This commit swaps the old rendclient code to use the new API.
I didn't try to accomodate the legacy service-side code in this API, since
that's too tangled up and it would mess up the new API considerably IMO (all
this service_pending_final_cpath_ref stuff is complicated and I didn't want to
change it).
Signed-off-by: David Goulet <dgoulet@torproject.org>
George Kadianakis [Tue, 2 May 2017 13:20:26 +0000 (16:20 +0300)]
Refactor legacy code to support hs_ident along with rend_data.
The legacy HS circuit code uses rend_data to match between circuits and
streams. We refactor some of that code so that it understands hs_ident
as well which is used for prop224.
George Kadianakis [Tue, 2 May 2017 13:19:12 +0000 (16:19 +0300)]
Refactor circuit_init_cpath_crypto() to do prop224 rend circuits.
circuit_init_cpath_crypto() is responsible for creating the cpath of legacy
SHA1/AES128 circuits currently. We want to use it for prop224 circuits, so we
refactor it to create circuits with SHA3-256 and AES256 as well.
Signed-off-by: David Goulet <dgoulet@torproject.org>
George Kadianakis [Tue, 2 May 2017 13:18:10 +0000 (16:18 +0300)]
Refactor the HS ntor key expansion to fit the e2e circuit API.
We want to use the circuit_init_cpath_crypto() function to setup our
cpath, and that function accepts a key array as input. So let's make our
HS ntor key expansion function also return a key array as output,
instead of a struct.
Also, we actually don't need KH from the key expansion, so the key
expansion output can be one DIGEST256_LEN shorter. See here for more
info: https://trac.torproject.org/projects/tor/ticket/22052#comment:3
David Goulet [Fri, 12 May 2017 15:39:46 +0000 (11:39 -0400)]
prop224: Add connection and circuit identifier object
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Fri, 7 Jul 2017 15:07:30 +0000 (11:07 -0400)]
Avoid a scan_build warning in dirvote_get_intermediate_param_value
Fixes bug 21495.
Nick Mathewson [Fri, 7 Jul 2017 14:57:27 +0000 (10:57 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Fri, 7 Jul 2017 14:57:05 +0000 (10:57 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
This is an "ours" commit to avoid taking the fix for 22838,
which we already have here.
Nick Mathewson [Fri, 7 Jul 2017 14:56:31 +0000 (10:56 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 7 Jul 2017 14:56:31 +0000 (10:56 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 7 Jul 2017 14:55:51 +0000 (10:55 -0400)]
Merge branch 'bug22838_028' into maint-0.2.8
Nick Mathewson [Thu, 6 Jul 2017 17:12:33 +0000 (13:12 -0400)]
mingw fix: avoid "unused var" warning.
This is a backport of
19615bce64cd381a925bc3910120ac39ca918e7c to
fix bug 22838.
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)]
Merge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 7 Jul 2017 14:51:25 +0000 (10:51 -0400)]
Mention TROVE-2017-007 in changes file for 22789
Nick Mathewson [Fri, 7 Jul 2017 14:49:48 +0000 (10:49 -0400)]
Use the correct TROVE id for #22753.
Nick Mathewson [Thu, 6 Jul 2017 13:32:22 +0000 (09:32 -0400)]
Merge remote-tracking branch 'public/bug19648'
Nick Mathewson [Thu, 6 Jul 2017 13:30:40 +0000 (09:30 -0400)]
Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'
Nick Mathewson [Thu, 6 Jul 2017 13:29:03 +0000 (09:29 -0400)]
Merge branch 'bug20488_029_squashed'
Nick Mathewson [Wed, 5 Jul 2017 17:32:14 +0000 (13:32 -0400)]
Improve warning message to stop implying nickname reg is a thing.
Closing ticket 20488.
Nick Mathewson [Wed, 5 Jul 2017 21:37:14 +0000 (17:37 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 21:37:06 +0000 (17:37 -0400)]
Fix a wide line from 22207
Nick Mathewson [Wed, 5 Jul 2017 21:00:46 +0000 (17:00 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 21:00:43 +0000 (17:00 -0400)]
Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
Nick Mathewson [Wed, 5 Jul 2017 20:11:48 +0000 (16:11 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 5 Jul 2017 20:11:48 +0000 (16:11 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 20:11:48 +0000 (16:11 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 5 Jul 2017 20:10:45 +0000 (16:10 -0400)]
Only disable -Wfloat-conversion on mingw when it exists.
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.
Nick Mathewson [Wed, 5 Jul 2017 19:59:17 +0000 (15:59 -0400)]
Make the strings from #1667 static.
Nick Mathewson [Wed, 5 Jul 2017 19:57:09 +0000 (15:57 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 19:56:57 +0000 (15:56 -0400)]
Fix mixed-sign comparison warning in fix for 22797.
Nick Mathewson [Wed, 5 Jul 2017 17:43:31 +0000 (13:43 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 5 Jul 2017 17:43:31 +0000 (13:43 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 17:43:31 +0000 (13:43 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 5 Jul 2017 17:43:21 +0000 (13:43 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 5 Jul 2017 17:42:47 +0000 (13:42 -0400)]
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Wed, 5 Jul 2017 17:42:37 +0000 (13:42 -0400)]
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Wed, 5 Jul 2017 17:42:32 +0000 (13:42 -0400)]
Merge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 5 Jul 2017 17:42:26 +0000 (13:42 -0400)]
Merge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 5 Jul 2017 17:41:27 +0000 (13:41 -0400)]
Merge branch 'bug22789_024' into maint-0.2.4
Nick Mathewson [Wed, 5 Jul 2017 15:19:03 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 5 Jul 2017 15:19:03 +0000 (11:19 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 15:19:03 +0000 (11:19 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 5 Jul 2017 15:18:59 +0000 (11:18 -0400)]
Merge branch 'bug22801_028' into maint-0.2.9
Nick Mathewson [Wed, 5 Jul 2017 15:16:51 +0000 (11:16 -0400)]
Merge branch 'maint-0.3.1'
Nick Mathewson [Wed, 5 Jul 2017 15:16:30 +0000 (11:16 -0400)]
Merge branch 'teor-bug22797-025' into maint-0.3.1
teor [Mon, 3 Jul 2017 05:30:52 +0000 (15:30 +1000)]
Always allow extra file descriptors when setting the connection maximum
When setting the maximum number of connections allowed by the OS,
always allow some extra file descriptors for other files.
Fixes bug 22797; bugfix on 0.2.0.10-alpha.
Nick Mathewson [Wed, 5 Jul 2017 15:01:36 +0000 (11:01 -0400)]
Merge branch 'neena-fix-1667'
Nick Mathewson [Wed, 5 Jul 2017 15:01:17 +0000 (11:01 -0400)]
Extract "not an HTTP proxy" messages.
Nick Mathewson [Wed, 5 Jul 2017 14:15:24 +0000 (10:15 -0400)]
Merge branch 'bug15554_032_01_squashed'
Nick Mathewson [Wed, 5 Jul 2017 14:15:17 +0000 (10:15 -0400)]
changes file for 15554
George Kadianakis [Tue, 20 Jun 2017 14:29:20 +0000 (17:29 +0300)]
Add test that parses a hardcoded v2 descriptor.
Nick Mathewson [Wed, 5 Jul 2017 14:01:48 +0000 (10:01 -0400)]
Merge branch 'onionskin_refactor_2'
Nick Mathewson [Wed, 5 Jul 2017 14:01:40 +0000 (10:01 -0400)]
changes file for 22804
Nick Mathewson [Wed, 5 Jul 2017 13:57:48 +0000 (09:57 -0400)]
changes file for bug 22750
cypherpunks [Wed, 28 Jun 2017 12:35:01 +0000 (12:35 +0000)]
Use the proper syscall in sandbox error messages
Fixes #22750.
Nick Mathewson [Wed, 5 Jul 2017 13:49:12 +0000 (09:49 -0400)]
Merge remote-tracking branch 'asn/ticket22727_032_02'
Nick Mathewson [Wed, 5 Jul 2017 13:36:31 +0000 (09:36 -0400)]
Merge remote-tracking branch 'dgoulet/ticket22726_032_02'
Roger Dingledine [Mon, 3 Jul 2017 21:16:26 +0000 (17:16 -0400)]
CREATE_FAST is for when you don't know the onion key
it isn't (anymore) for when you think you can get away with saving some
crypto operations.