George Kadianakis
8fda94f944
hs-v3: Move ob_subcreds to hs_service_state_t.
...
It's more natural there since it's runtime state.
2020-03-30 23:37:26 +03:00
George Kadianakis
a4d60ff854
Merge branch 'maint-0.4.3'
2020-03-23 16:57:27 +02:00
George Kadianakis
29420ab396
Merge branch 'tor-github/pr/1788' into maint-0.4.3
2020-03-23 16:56:59 +02:00
teor
e0eec3bf29
parseconf: Add ORPort and DirPort auto tests
...
These tests don't actually trigger bug 32588, but they do increase
the coverage of the auto port config code.
Tests for 32588.
2020-03-21 04:07:03 +10:00
teor
4b914dea02
Merge branch 'bug32588_043' into bug32588_master
2020-03-21 04:02:08 +10:00
teor
52f61ec83e
Merge branch 'bug32588_042' into bug32588_043
...
Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.
2020-03-21 04:01:00 +10:00
teor
5e2f31f177
Merge branch 'bug32588_041' into bug32588_042
2020-03-21 03:52:32 +10:00
teor
2962c32b7a
Merge branch 'bug32588_035' into bug32588_041
...
Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.
2020-03-21 03:50:36 +10:00
Nick Mathewson
96ca14d989
Add a test for the localhost case.
2020-03-21 03:44:01 +10:00
Nick Mathewson
1251265a0f
Extend test to handle router_get_advertised_ipv6_or_ap
2020-03-21 03:43:58 +10:00
Nick Mathewson
1ba79d4567
Add a test for router_get_advertised_or_port_by_af().
2020-03-21 03:43:55 +10:00
Nick Mathewson
6ffe073db7
Add tests for get_first_advertised_{addr,port}_by_type_af()
2020-03-21 03:43:52 +10:00
teor
4bb06cae26
Merge branch 'maint-0.4.3'
2020-03-20 11:25:04 +10:00
teor
eb2d08a72c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-20 11:24:57 +10:00
teor
3aa855dc68
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-20 11:24:51 +10:00
Nick Mathewson
42ea03eb7f
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
2020-03-19 18:38:18 -04:00
Nick Mathewson
6bafe97bc1
Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.
...
For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run
the tests and suppress all the "crypto/" tests. You could get the
same effect by running "./src/test/test :crypto/..", but that can be
harder to arrange from CI.
Part of a fix/workaround for 33643.
2020-03-19 18:36:36 -04:00
George Kadianakis
dccac40e69
Merge branch 'tor-github/pr/1778'
2020-03-19 17:16:00 +02:00
Nick Mathewson
4f596b3edf
Merge remote-tracking branch 'tor-github/pr/1807/head'
2020-03-19 08:02:09 -04:00
George Kadianakis
e8f0860557
Merge branch 'tor-github/pr/1792'
2020-03-19 13:43:49 +02:00
David Goulet
4dbbe47d86
hs-v3: Improve accessor semantic of client cached object
...
Add an inline helper function that indicates if the cached object contains a
decrypted descriptor or not.
The descriptor object is NULL if tor is unable to decrypt it (lacking client
authorization) and some actions need to be done only when we have a decrypted
object.
This improves code semantic.
Fixes #33458
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-19 13:43:39 +02:00
teor
c862205ba5
coverity: Silence spurious unreachable warning
...
Closes bug 33641; not in any released version of tor.
2020-03-19 17:11:13 +10:00
Nick Mathewson
3d8c97a988
Merge branch 'maint-0.4.3'
2020-03-17 15:22:36 -04:00
Nick Mathewson
e0d68ce84f
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 15:22:36 -04:00
Nick Mathewson
85141a3a74
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 15:22:36 -04:00
Nick Mathewson
3c8a4b8fbd
Merge branch 'trove_2020_002_041' into maint-0.4.1
2020-03-17 15:22:02 -04:00
Nick Mathewson
fe3d8ec38e
Merge branch 'trove_2020_002_035' into maint-0.3.5
2020-03-17 15:21:48 -04:00
Nick Mathewson
d3c4ed08f1
Merge branch 'maint-0.4.3'
2020-03-17 11:53:24 -04:00
Nick Mathewson
bc4c89eb2f
Split a wide line.
2020-03-17 11:53:01 -04:00
Nick Mathewson
7cd4dcf5a6
Merge branch 'maint-0.4.3'
2020-03-17 11:48:45 -04:00
George Kadianakis
5ff8757aa8
Add unittest for TROVE-2020-003.
...
This unittest currently fails on purpose (to demonstrate the bug) but it will
stop failing after the next commit (the bugfix).
2020-03-17 11:48:36 -04:00
Nick Mathewson
9163781039
Merge branch 'trove_2020_002_035' into trove_2020_002_041
2020-03-17 10:45:03 -04:00
Nick Mathewson
2328c79a5f
Add off-by-one checks for key length.
2020-03-17 10:44:38 -04:00
teor
44f92e8e42
Merge remote-tracking branch 'tor-github/pr/1784'
2020-03-17 23:11:31 +10:00
teor
0fa1d8ef92
Merge branch 'pr1777_squashed'
2020-03-17 21:08:45 +10:00
rl1987
5675cbd4c7
Conditionally disable part of hs_intropoint/introduce1_validation
...
This makes it not fail when ALL_BUGS_ARE_FATAL is enabled. Fixes bug 33546.
2020-03-17 21:08:16 +10:00
rl1987
4ab20b4f63
Conditionally disable part of dir/param_voting_lookup that expects soft asserts to happen
2020-03-17 21:08:13 +10:00
teor
9c73f5adc4
Run "make autostyle"
2020-03-17 18:19:04 +10:00
Nick Mathewson
49eec76c5e
Merge branch 'maint-0.4.3'
2020-03-16 12:21:57 -04:00
Nick Mathewson
855cd533e1
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
2020-03-16 12:21:49 -04:00
Nick Mathewson
612c40bc39
Adjust unit tests for patch for 32672 (rejecting old version)
...
Patch by Neel Chauhan.
2020-03-16 10:42:40 -04:00
Nick Mathewson
dd6e2277e0
Merge branch 'trove_2020_002_035' into trove_2020_002_041
2020-03-14 14:20:51 -04:00
Nick Mathewson
ab2e66ccdc
Add a test for crypto_pk_asn1_decode_private maxbits.
2020-03-14 14:17:13 -04:00
Nick Mathewson
b504942331
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
2020-03-13 16:42:47 -04:00
Nick Mathewson
8bc4822ba6
Merge branch 'maint-0.4.3'
2020-03-12 13:45:06 -04:00
Nick Mathewson
3e42004e54
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
2020-03-12 13:42:42 -04:00
Nick Mathewson
8dc7ad1275
Fix unit tests that look at contactinfo logs.
2020-03-12 13:42:17 -04:00
Nick Mathewson
eed196f122
Merge branch 'bug33032_042' into bug33032_043
2020-03-11 10:35:47 -04:00
Nick Mathewson
554b805093
Merge branch 'bug33032_041' into bug33032_042
2020-03-11 10:35:47 -04:00
Nick Mathewson
55055396cc
Merge branch 'maint-0.4.1' into bug33032_041
2020-03-11 10:35:46 -04:00
