c6d3bebb1e
Merge remote-tracking branch 'tor-github/pr/409'
2018-10-24 09:06:29 -04:00
05d65cb067
Merge branch 'maint-0.3.5'
2018-10-23 19:22:05 -04:00
289a7dbac3
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-23 19:21:44 -04:00
7edc594ee7
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-23 19:18:23 -04:00
169bc670dd
Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
2018-10-23 19:17:48 -04:00
8b2e72106a
test: Add test for closing intro circuits when storing a new descriptor
...
This is client side and related to 27471 for previous commit that fixes this
issue.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-10-18 12:56:51 -04:00
d1eac7830f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-18 09:12:58 -04:00
7f6c0fce46
Merge branch 'bug27800-034' into bug27800-035
2018-10-17 16:00:11 -05:00
4e7f65ee5d
Merge branch 'bug27800-033' into tor-034
2018-10-17 15:42:58 -05:00
93fd924bdb
Log more info for duplicate ed25519 IDs
...
Occasionally, key pinning doesn't catch a relay that shares an ed25519
ID with another relay. Log the identity fingerprints and the shared
ed25519 ID when this happens, instead of making a BUG() warning.
Fixes bug 27800; bugfix on 0.3.2.1-alpha.
2018-10-17 15:39:55 -05:00
7fd82a4570
One testcase for annotation handling in tokenize_string()
2018-10-16 18:04:54 +03:00
f10d664fd1
Test AT_END checking in tokenize_string()
2018-10-16 18:04:54 +03:00
1a4edceee9
Add testcase for too many elements in tokenize_string() input
2018-10-16 18:04:54 +03:00
7c8bf2f7c7
Add testcase for too few elements in tokenize_string() input
2018-10-16 18:04:54 +03:00
78c446af7e
Unit-test multiple line parsing with tokenize_string()
2018-10-16 18:04:54 +03:00
81731a290d
Unit-test some error conditions in get_next_token()
2018-10-16 18:04:54 +03:00
6c5ba2662a
Test object parsing in get_next_token()
2018-10-16 18:04:54 +03:00
38a7033d33
Fix memory management in test_parsecommon_get_next_token_parse_keys
2018-10-16 18:04:54 +03:00
7764d6dfc9
Test RSA private key parsing with get_next_token()
2018-10-16 18:04:54 +03:00
569d8d8cd7
Test-case for public key parsing using get_next_token()
2018-10-16 18:04:52 +03:00
5c891dba77
Test argument concatenation in get_next_token()
2018-10-16 18:04:20 +03:00
7829e3a868
First testcase for get_next_token()
2018-10-16 18:04:20 +03:00
55412c4f3d
Add new source file to test target
2018-10-16 18:04:17 +03:00
b7fbd1f329
Merge branch 'maint-0.3.4'
2018-10-16 08:04:34 -04:00
38599de2dd
test: Update approx_time before the test starts
...
This way we have the same time source when the IP is created and tested later.
Fixes #27810
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-10-16 08:03:55 -04:00
2dccef0eb4
Merge branch 'bug27772_squashed'
2018-10-14 15:31:52 -04:00
6925b61cfd
Fix various GCC LTO warnings in the unit tests.
2018-10-14 15:25:16 -04:00
370d9922a4
Use the correct function signatures in test_relaycell.c
...
This is now officially an antipattern: please let's never copy a
function declaration in two places again. That's what headers are
for.
2018-10-14 15:25:16 -04:00
67351f6724
Merge remote-tracking branch 'tor-github/pr/380'
2018-10-12 11:39:37 -04:00
58299b2927
Merge remote-tracking branch 'public/bug27728'
2018-10-01 12:06:39 -05:00
886dc8b0a5
Remove routerparse include from files that dont use it
2018-10-01 11:35:11 -05:00
d199348664
Remove versions.h include from routerparse.h
2018-10-01 11:22:47 -05:00
35db3f8162
Extract addr-policy parsing code.
2018-10-01 11:17:19 -05:00
4201203845
extract networkstatus parsing to its own file.
2018-10-01 10:46:00 -05:00
cd23903427
Pull detached-signatures code into dirauth.
2018-10-01 10:46:00 -05:00
2be35f4d61
Split microdescriptor parser into its own file.
2018-10-01 10:46:00 -05:00
82f4d3ca75
Move v2 hs parsing into feature/rend
2018-10-01 00:09:00 -05:00
430ca38f70
Split the authority-cert and signature/hash code from routerparse
2018-10-01 00:09:00 -05:00
fec3b3bb93
Extract logic for dumping unparseable junk from routerparse.c
2018-10-01 00:04:58 -05:00
6785aa4010
Move routerparse and parsecommon to their own module.
2018-10-01 00:04:06 -05:00
9e65e7a36f
Merge branch 'split_stats'
2018-09-27 16:26:06 -04:00
d0b2b5a202
Always initialize the periodic events list.
...
Various places in our code try to activate these events or check
their status, so we should make sure they're initialized as early as
possible. Fixes bug 27861; bugfix on 0.3.5.1-alpha.
2018-09-27 13:24:36 -04:00
c8f2a6d2fe
Extract the non-stats part of geoip into a new src/lib/geoip.
2018-09-27 10:26:01 -04:00
fa32574bdb
Remove excess dependencies from geoip.c
2018-09-27 10:15:39 -04:00
f403af2207
Split geoip from geoip-related stats.
...
This commit just moves the code to two separate files. The geoip
code still has a few needless dependencies on core/* and features/*.
2018-09-27 09:36:52 -04:00
241c1505cc
Move the predicted ports code out of rephist.c
...
It differs from the rest of the rephist code in that it's actually
necessary for Tor to operate, so it should probably go somewhere
else. I'm not sure where yet, so I'll leave it in the same
directory, but give it its own file.
2018-09-27 08:21:17 -04:00
4f0bc0c8f5
Revise things that had included router.h before
...
Make them only include the headers that they needed, and sort their
headers while we're at it.
2018-09-25 17:57:58 -04:00
fcd0f76134
Extract all the "am I a server" functions from router.c
2018-09-25 16:00:50 -04:00
934859cf80
Move key-loading and crosscert-checking out of feature/relay
...
This is also used by onion services, so it needs to go in another
module.
2018-09-25 15:14:57 -04:00
78295904f7
Merge branch 'ticket26744'
2018-09-24 10:56:50 -04:00
Nick Mathewson
David Goulet
Taylor Yu
rl1987