]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoTest argument concatenation in get_next_token()
rl1987 [Fri, 12 Oct 2018 12:48:38 +0000 (15:48 +0300)] 
Test argument concatenation in get_next_token()

7 years agoFirst testcase for get_next_token()
rl1987 [Fri, 12 Oct 2018 11:19:40 +0000 (14:19 +0300)] 
First testcase for get_next_token()

7 years agoAdd new source file to test target
rl1987 [Thu, 11 Oct 2018 12:22:12 +0000 (15:22 +0300)] 
Add new source file to test target

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Tue, 16 Oct 2018 12:04:34 +0000 (08:04 -0400)] 
Merge branch 'maint-0.3.4'

7 years agotest: Update approx_time before the test starts
David Goulet [Mon, 24 Sep 2018 13:48:28 +0000 (09:48 -0400)] 
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>
7 years agoMerge remote-tracking branch 'public/bug27990'
Nick Mathewson [Tue, 16 Oct 2018 12:02:01 +0000 (08:02 -0400)] 
Merge remote-tracking branch 'public/bug27990'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 16:52:54 +0000 (12:52 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 15 Oct 2018 16:52:54 +0000 (12:52 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoFix another tor_assert(0) case
Nick Mathewson [Mon, 15 Oct 2018 16:52:48 +0000 (12:52 -0400)] 
Fix another tor_assert(0) case

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 16:47:46 +0000 (12:47 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 15 Oct 2018 16:47:46 +0000 (12:47 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Mon, 15 Oct 2018 16:47:46 +0000 (12:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoFix make check-spaces.
Nick Mathewson [Mon, 15 Oct 2018 16:47:19 +0000 (12:47 -0400)] 
Fix make check-spaces.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 14:48:35 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 15 Oct 2018 14:48:35 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoAdjust tor_assert_unreached()
Nick Mathewson [Mon, 15 Oct 2018 14:46:24 +0000 (10:46 -0400)] 
Adjust tor_assert_unreached()

This version of the macro makes it obvious to the compiler that
"tor_assert_unreached()" will always abort().

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 15 Oct 2018 14:37:53 +0000 (10:37 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 14:37:52 +0000 (10:37 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Mon, 15 Oct 2018 14:37:49 +0000 (10:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge branch 'bug27709_029' into maint-0.2.9
Nick Mathewson [Mon, 15 Oct 2018 14:34:39 +0000 (10:34 -0400)] 
Merge branch 'bug27709_029' into maint-0.2.9

7 years agoExplain a bit more about branch prediction in the unit-test case
Nick Mathewson [Mon, 15 Oct 2018 14:16:34 +0000 (10:16 -0400)] 
Explain a bit more about branch prediction in the unit-test case

7 years agoRemove a double-newline and improve a comment
Nick Mathewson [Sun, 14 Oct 2018 19:33:34 +0000 (15:33 -0400)] 
Remove a double-newline and improve a comment

7 years agoMerge branch 'bug27772_squashed'
Nick Mathewson [Sun, 14 Oct 2018 19:31:52 +0000 (15:31 -0400)] 
Merge branch 'bug27772_squashed'

7 years agoFix various GCC LTO warnings in the unit tests.
Nick Mathewson [Tue, 18 Sep 2018 19:32:25 +0000 (15:32 -0400)] 
Fix various GCC LTO warnings in the unit tests.

7 years agoIn tor_tls_get_my_certs(), set cert ptrs even on failure
Nick Mathewson [Tue, 18 Sep 2018 19:18:52 +0000 (15:18 -0400)] 
In tor_tls_get_my_certs(), set cert ptrs even on failure

Nothing should ever look at them on failure, but in some cases,
the unit tests don't check for failure, and then GCC-LTO freaks out.

Fixes part of 27772.

7 years agoInitialize some locals in socks5 parsing code.
Nick Mathewson [Tue, 18 Sep 2018 19:13:10 +0000 (15:13 -0400)] 
Initialize some locals in socks5 parsing code.

These confused GCC LTO, which thought they might be used
uninitialized.  I'm pretty sure that as long as 'res' indicates
success, they will always be set to something, but let's unconfuse
the compiler in any case.

7 years agoUse the correct function signatures in test_relaycell.c
Nick Mathewson [Tue, 18 Sep 2018 19:07:02 +0000 (15:07 -0400)] 
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.

7 years agoUse assertions so GCC LTO doesn't worry about TLS channel conversion
Nick Mathewson [Tue, 18 Sep 2018 19:06:36 +0000 (15:06 -0400)] 
Use assertions so GCC LTO doesn't worry about TLS channel conversion

Part of #27772

7 years agoMerge remote-tracking branch 'tor-github/pr/402'
Nick Mathewson [Sun, 14 Oct 2018 19:20:39 +0000 (15:20 -0400)] 
Merge remote-tracking branch 'tor-github/pr/402'

7 years agoreport origin of mystery core file
Taylor Yu [Fri, 12 Oct 2018 01:25:41 +0000 (20:25 -0500)] 
report origin of mystery core file

Report what program produced the mysterious core file that we
occasionally see on Travis CI during make distcheck.  Closes ticket
28024.

7 years agoMerge remote-tracking branch 'tor-github/pr/380'
Nick Mathewson [Fri, 12 Oct 2018 15:39:37 +0000 (11:39 -0400)] 
Merge remote-tracking branch 'tor-github/pr/380'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 10 Oct 2018 21:12:34 +0000 (17:12 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 10 Oct 2018 21:12:34 +0000 (17:12 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Wed, 10 Oct 2018 21:12:34 +0000 (17:12 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
Nick Mathewson [Wed, 10 Oct 2018 21:12:11 +0000 (17:12 -0400)] 
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9

7 years agoMerge branch 'bug27738-034-merged' into bug27738-master-merged
Taylor Yu [Wed, 10 Oct 2018 20:17:47 +0000 (15:17 -0500)] 
Merge branch 'bug27738-034-merged' into bug27738-master-merged

7 years agoMerge branch 'bug27738-033' into bug27738-034
Taylor Yu [Wed, 10 Oct 2018 20:13:02 +0000 (15:13 -0500)] 
Merge branch 'bug27738-033' into bug27738-034

7 years agoMerge remote-tracking branch 'teor/bug27738-032' into bug27738-033
Taylor Yu [Wed, 10 Oct 2018 20:01:59 +0000 (15:01 -0500)] 
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Wed, 10 Oct 2018 18:27:27 +0000 (14:27 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
Nick Mathewson [Wed, 10 Oct 2018 18:27:24 +0000 (14:27 -0400)] 
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Wed, 10 Oct 2018 15:34:49 +0000 (11:34 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 10 Oct 2018 15:34:49 +0000 (11:34 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 10 Oct 2018 15:34:48 +0000 (11:34 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoUpdate geoip and geoip6 to the October 9 2018 database.
Karsten Loesing [Wed, 10 Oct 2018 15:26:41 +0000 (17:26 +0200)] 
Update geoip and geoip6 to the October 9 2018 database.

7 years agoAdd sys/time.h include back to procmon.c
Nick Mathewson [Wed, 10 Oct 2018 15:26:38 +0000 (11:26 -0400)] 
Add sys/time.h include back to procmon.c

7 years agofixup! Changes file for apveyor changes
Nick Mathewson [Wed, 10 Oct 2018 15:10:29 +0000 (11:10 -0400)] 
fixup! Changes file for apveyor changes

7 years agoChanges file for apveyor changes
Nick Mathewson [Wed, 10 Oct 2018 14:20:01 +0000 (10:20 -0400)] 
Changes file for apveyor changes

7 years agoAppveyor: Don't try to install the mingw openssl package
Nick Mathewson [Wed, 10 Oct 2018 13:49:02 +0000 (09:49 -0400)] 
Appveyor: Don't try to install the mingw openssl package

This package conflicts with a preinstalled mingw openssl.

Fixes bug 27943. I think this was an appveyor change, not a Tor bug.

7 years agoInstall only one of the two mingw architectures in appveyor
Nick Mathewson [Wed, 10 Oct 2018 13:44:36 +0000 (09:44 -0400)] 
Install only one of the two mingw architectures in appveyor

Closes ticket 27765

This commit also changes the appveyor file to a unified line ending
style, since the old one was pretty confused.  Use "-b" to see the
real differences.

7 years agoMerge remote-tracking branch 'tor-github/pr/384'
Nick Mathewson [Wed, 10 Oct 2018 13:24:48 +0000 (09:24 -0400)] 
Merge remote-tracking branch 'tor-github/pr/384'

7 years agoMerge remote-tracking branch 'tor-github/pr/385'
Nick Mathewson [Tue, 9 Oct 2018 16:46:46 +0000 (12:46 -0400)] 
Merge remote-tracking branch 'tor-github/pr/385'

7 years agoMerge remote-tracking branch 'public/ticket27856'
Nick Mathewson [Tue, 9 Oct 2018 13:04:53 +0000 (09:04 -0400)] 
Merge remote-tracking branch 'public/ticket27856'

7 years agoAdd changes file
rl1987 [Sun, 7 Oct 2018 15:28:04 +0000 (18:28 +0300)] 
Add changes file

7 years agoAdd newline between hs_client_get_random_intro_from_edge() and hs_client_receive_intr...
Neel Chauhan [Fri, 5 Oct 2018 23:54:26 +0000 (19:54 -0400)] 
Add newline between hs_client_get_random_intro_from_edge() and hs_client_receive_introduce_ack()

7 years agoMake sure we're removing conn from old_conns *once*
rl1987 [Wed, 3 Oct 2018 12:45:48 +0000 (15:45 +0300)] 
Make sure we're removing conn from old_conns *once*

7 years agoRefrain from using SMARTLIST_DEL_CURRENT in retry_all_listeners
rl1987 [Fri, 21 Sep 2018 16:23:19 +0000 (19:23 +0300)] 
Refrain from using SMARTLIST_DEL_CURRENT in retry_all_listeners

7 years agoMerge remote-tracking branch 'public/bug27893'
Nick Mathewson [Mon, 1 Oct 2018 17:12:33 +0000 (12:12 -0500)] 
Merge remote-tracking branch 'public/bug27893'

7 years agoMerge remote-tracking branch 'public/bug27728'
Nick Mathewson [Mon, 1 Oct 2018 17:06:39 +0000 (12:06 -0500)] 
Merge remote-tracking branch 'public/bug27728'

7 years agoFix a bug where we would crash on --version.
Nick Mathewson [Mon, 1 Oct 2018 17:01:46 +0000 (12:01 -0500)] 
Fix a bug where we would crash on --version.

Bug not in any released Tor.

test-stem would have caught this.

7 years agochanges file for splitting routerparse.c (#27924)
Nick Mathewson [Mon, 1 Oct 2018 16:45:11 +0000 (11:45 -0500)] 
changes file for splitting routerparse.c (#27924)

7 years agoRemove routerparse include from files that dont use it
Nick Mathewson [Mon, 1 Oct 2018 16:35:11 +0000 (11:35 -0500)] 
Remove routerparse include from files that dont use it

7 years agoRemove versions.h include from routerparse.h
Nick Mathewson [Mon, 1 Oct 2018 16:22:47 +0000 (11:22 -0500)] 
Remove versions.h include from routerparse.h

7 years agoRemove unused headers from routerparse.c
Nick Mathewson [Mon, 1 Oct 2018 16:17:33 +0000 (11:17 -0500)] 
Remove unused headers from routerparse.c

7 years agoExtract addr-policy parsing code.
Nick Mathewson [Mon, 1 Oct 2018 16:08:09 +0000 (11:08 -0500)] 
Extract addr-policy parsing code.

7 years agoMove summarize_protover_flags to versions.c
Nick Mathewson [Mon, 1 Oct 2018 15:48:55 +0000 (10:48 -0500)] 
Move summarize_protover_flags to versions.c

7 years agoextract networkstatus parsing to its own file.
Nick Mathewson [Mon, 1 Oct 2018 15:44:59 +0000 (10:44 -0500)] 
extract networkstatus parsing to its own file.

7 years agoPull detached-signatures code into dirauth.
Nick Mathewson [Mon, 1 Oct 2018 05:33:23 +0000 (00:33 -0500)] 
Pull detached-signatures code into dirauth.

7 years agoSplit microdescriptor parser into its own file.
Nick Mathewson [Mon, 1 Oct 2018 04:51:47 +0000 (23:51 -0500)] 
Split microdescriptor parser into its own file.

7 years agoRemove addr_policy_assert_ok() as unused
Nick Mathewson [Mon, 1 Oct 2018 04:45:17 +0000 (23:45 -0500)] 
Remove addr_policy_assert_ok() as unused

7 years agoRemove dump_distinct_digest_count()
Nick Mathewson [Mon, 1 Oct 2018 04:42:21 +0000 (23:42 -0500)] 
Remove dump_distinct_digest_count()

It was disabled-by-default for ages, and it no longer compiles. I
think it's safe to call it obsolete.

7 years agoRemove router_get_dir_hash as unused.
Nick Mathewson [Mon, 1 Oct 2018 04:37:43 +0000 (23:37 -0500)] 
Remove router_get_dir_hash as unused.

7 years agoMove v2 hs parsing into feature/rend
Nick Mathewson [Mon, 1 Oct 2018 04:31:59 +0000 (23:31 -0500)] 
Move v2 hs parsing into feature/rend

7 years agoSplit the authority-cert and signature/hash code from routerparse
Nick Mathewson [Mon, 1 Oct 2018 04:08:25 +0000 (23:08 -0500)] 
Split the authority-cert and signature/hash code from routerparse

7 years agoExtract the version-managing code from routerparse.c
Nick Mathewson [Sun, 30 Sep 2018 23:27:23 +0000 (18:27 -0500)] 
Extract the version-managing code from routerparse.c

Leave the versions.h include in routerparse.h for now; I'll remove
it later.

7 years agoExtract logic for dumping unparseable junk from routerparse.c
Nick Mathewson [Sun, 30 Sep 2018 23:15:00 +0000 (18:15 -0500)] 
Extract logic for dumping unparseable junk from routerparse.c

7 years agoMove routerparse and parsecommon to their own module.
Nick Mathewson [Sun, 30 Sep 2018 22:53:58 +0000 (17:53 -0500)] 
Move routerparse and parsecommon to their own module.

7 years agoDetect an unlikely integer overflow.
Nick Mathewson [Thu, 27 Sep 2018 20:30:02 +0000 (16:30 -0400)] 
Detect an unlikely integer overflow.

7 years agoMerge branch 'split_stats'
Nick Mathewson [Thu, 27 Sep 2018 20:26:06 +0000 (16:26 -0400)] 
Merge branch 'split_stats'

7 years agoMerge branch 'ticket_27861'
Nick Mathewson [Thu, 27 Sep 2018 20:24:47 +0000 (16:24 -0400)] 
Merge branch 'ticket_27861'

7 years agoPrevent duplicate initialization of NSS DH module
Nick Mathewson [Thu, 27 Sep 2018 17:26:47 +0000 (13:26 -0400)] 
Prevent duplicate initialization of NSS DH module

Allowing this didn't do any actual harm, since there aren't any
shared structures or leakable objects here.  Still, it's bad style
and might cause trouble in the future.

Closes ticket 27856.

7 years agoAlways initialize the periodic events list.
Nick Mathewson [Thu, 27 Sep 2018 16:44:20 +0000 (12:44 -0400)] 
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.

7 years agoFix a memory leak in --dump-config
Nick Mathewson [Thu, 27 Sep 2018 17:05:19 +0000 (13:05 -0400)] 
Fix a memory leak in --dump-config

When freeing a configuration object from confparse.c in
dump_config(), we need to call the appropriate higher-level free
function (like or_options_free()) and not just config_free().

This only happens with options (since they're the one where
options_validate allocates extra stuff) and only when running
--dump-config with something other than minimal (since
OPTIONS_DUMP_MINIMAL doesn't hit this code).

Fixes bug 27893; bugfix on 0.3.2.1-alpha.

7 years agoMark a variable static.
Nick Mathewson [Thu, 27 Sep 2018 15:59:39 +0000 (11:59 -0400)] 
Mark a variable static.

7 years agogeoip: fix windows compilation
Nick Mathewson [Thu, 27 Sep 2018 15:02:58 +0000 (11:02 -0400)] 
geoip: fix windows compilation

7 years agoChanges file for splitting stats
Nick Mathewson [Thu, 27 Sep 2018 14:30:17 +0000 (10:30 -0400)] 
Changes file for splitting stats

7 years agoExtract the non-stats part of geoip into a new src/lib/geoip.
Nick Mathewson [Thu, 27 Sep 2018 14:26:01 +0000 (10:26 -0400)] 
Extract the non-stats part of geoip into a new src/lib/geoip.

7 years agoRemove excess dependencies from geoip.c
Nick Mathewson [Thu, 27 Sep 2018 14:15:39 +0000 (10:15 -0400)] 
Remove excess dependencies from geoip.c

7 years agoSplit geoip from geoip-related stats.
Nick Mathewson [Thu, 27 Sep 2018 13:35:47 +0000 (09:35 -0400)] 
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/*.

7 years agoMove the n_v3_ns_requests field out of geoip_country_t
Nick Mathewson [Thu, 27 Sep 2018 13:04:08 +0000 (09:04 -0400)] 
Move the n_v3_ns_requests field out of geoip_country_t

This is preparation for splitting geoip.c into stats and non-stats
portions.

7 years agoMove the predicted ports code out of rephist.c
Nick Mathewson [Thu, 27 Sep 2018 12:21:17 +0000 (08:21 -0400)] 
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.

7 years agoMerge branch 'router_split'
Nick Mathewson [Wed, 26 Sep 2018 13:47:59 +0000 (09:47 -0400)] 
Merge branch 'router_split'

7 years agoMerge remote-tracking branch 'dgoulet/bug27550_035_01'
Nick Mathewson [Wed, 26 Sep 2018 12:36:09 +0000 (08:36 -0400)] 
Merge remote-tracking branch 'dgoulet/bug27550_035_01'

7 years agoChanges file for splitting router.c
Nick Mathewson [Tue, 25 Sep 2018 22:54:17 +0000 (18:54 -0400)] 
Changes file for splitting router.c

7 years agoRemove extra includes from router.c
Nick Mathewson [Tue, 25 Sep 2018 22:33:13 +0000 (18:33 -0400)] 
Remove extra includes from router.c

7 years agoRevise things that had included router.h before
Nick Mathewson [Tue, 25 Sep 2018 21:57:58 +0000 (17:57 -0400)] 
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.

7 years agoMove the "is the network disabled?" functions out of router.c
Nick Mathewson [Tue, 25 Sep 2018 21:22:14 +0000 (17:22 -0400)] 
Move the "is the network disabled?" functions out of router.c

Since this is completely core functionality, I'm putting it in
core/mainloop, even though it depends on feature/hibernate. We'll
have to sort that out in the future.

7 years agoMove routerinfo_t functions out of router.c
Nick Mathewson [Tue, 25 Sep 2018 20:37:54 +0000 (16:37 -0400)] 
Move routerinfo_t functions out of router.c

(It turns out that some of the functions in router.h didn't even
exist any more, so I just got to delete their declarations completely.)

7 years agoExtract nickname-checking functions from router.c
Nick Mathewson [Tue, 25 Sep 2018 20:22:11 +0000 (16:22 -0400)] 
Extract nickname-checking functions from router.c

7 years agoMove the various _describe() functions out of router.c
Nick Mathewson [Tue, 25 Sep 2018 20:13:47 +0000 (16:13 -0400)] 
Move the various _describe() functions out of router.c

Note that I haven't separated the headers yet (there's still an

7 years agoExtract all the "am I a server" functions from router.c
Nick Mathewson [Tue, 25 Sep 2018 20:00:50 +0000 (16:00 -0400)] 
Extract all the "am I a server" functions from router.c