]>
git.ipfire.org Git - thirdparty/tor.git/log
cypherpunks [Thu, 12 Mar 2020 16:02:00 +0000 (16:02 +0000)]
buf: add BUF_MAX_LEN
cypherpunks [Tue, 24 Mar 2020 05:51:12 +0000 (05:51 +0000)]
Merge branch 'maint-0.4.3'
cypherpunks [Thu, 12 Mar 2020 19:55:12 +0000 (19:55 +0000)]
core/mainloop: remove noisy logging
cypherpunks [Tue, 3 Mar 2020 07:01:05 +0000 (07:01 +0000)]
core/mainloop: Limit growth of conn->inbuf
If the buf_t's length could potentially become greater than INT_MAX - 1,
it sets off an IF_BUG_ONCE in buf_read_from_tls().
All of the rest of the buffers.c code has similar BUG/asserts for this
invariant.
George Kadianakis [Mon, 23 Mar 2020 14:56:59 +0000 (16:56 +0200)]
Merge branch 'tor-github/pr/1788' into maint-0.4.3
Nick Mathewson [Fri, 20 Mar 2020 12:06:30 +0000 (08:06 -0400)]
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
teor [Fri, 20 Mar 2020 07:01:06 +0000 (17:01 +1000)]
relay/dirauth: Set some output arguments in stubs
And document how some functions set their output arguments.
Fixes bug 33674; bugfix on 0.4.3.1-alpha.
Nick Mathewson [Fri, 20 Mar 2020 00:04:53 +0000 (20:04 -0400)]
Set *have_low_ports_out from stub port_parse_ports_relay().
Previously we just ignored this option, which would leave it unset,
and cause an assertion failure later on when running with the User
option.
Fixes bug 33668; bugfix on 0.4.3.1-alpha.
teor [Fri, 20 Mar 2020 07:32:57 +0000 (17:32 +1000)]
practracker: Disable practracker in git hooks
Disable our coding standards best practices tracker in our git hooks.
0.4.3 branches only.
Closes ticket 33678.
teor [Fri, 20 Mar 2020 05:39:55 +0000 (15:39 +1000)]
dirauth: Remove a duplicate macro definition
Obviously correct changes to already-reviewed code.
teor [Fri, 20 Mar 2020 01:24:57 +0000 (11:24 +1000)]
Merge branch 'maint-0.4.2' into maint-0.4.3
teor [Fri, 20 Mar 2020 01:24:51 +0000 (11:24 +1000)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Thu, 19 Mar 2020 22:38:18 +0000 (18:38 -0400)]
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
Nick Mathewson [Thu, 19 Mar 2020 19:28:55 +0000 (15:28 -0400)]
Appveyor: disable crypto/openssl_version
Nick Mathewson [Thu, 19 Mar 2020 19:25:11 +0000 (15:25 -0400)]
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.
teor [Thu, 19 Mar 2020 08:02:32 +0000 (18:02 +1000)]
doc: Fix a manual page typo
And consistently talk about extra-info document publishing.
Obviously correct documentation changes.
teor [Thu, 19 Mar 2020 06:56:49 +0000 (16:56 +1000)]
Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
teor [Wed, 18 Mar 2020 23:24:15 +0000 (09:24 +1000)]
doc: Fix a man page typo
Obviously correct changes to already-reviewed code.
Nick Mathewson [Wed, 18 Mar 2020 16:17:20 +0000 (12:17 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
"ours" to avoid version bump.
Nick Mathewson [Wed, 18 Mar 2020 16:17:11 +0000 (12:17 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" to avoid version bump.
Nick Mathewson [Wed, 18 Mar 2020 16:16:59 +0000 (12:16 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.1
"ours" to avoid version bump.
Nick Mathewson [Wed, 18 Mar 2020 16:16:11 +0000 (12:16 -0400)]
Bump version to 0.4.2.7-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:53 +0000 (12:15 -0400)]
Bump version to 0.4.1.9-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:32 +0000 (12:15 -0400)]
Bump version to 0.3.5.10-dev
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 18 Mar 2020 12:19:48 +0000 (08:19 -0400)]
Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 19:22:02 +0000 (15:22 -0400)]
Merge branch 'trove_2020_002_041' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 19:21:48 +0000 (15:21 -0400)]
Merge branch 'trove_2020_002_035' into maint-0.3.5
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 17:56:03 +0000 (13:56 -0400)]
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 15:53:01 +0000 (11:53 -0400)]
Split a wide line.
George Kadianakis [Tue, 11 Feb 2020 12:51:58 +0000 (14:51 +0200)]
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).
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
George Kadianakis [Tue, 11 Feb 2020 16:37:55 +0000 (18:37 +0200)]
Fix TROVE-2020-003.
Given that
ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).
In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.
George Kadianakis [Mon, 10 Feb 2020 14:35:40 +0000 (16:35 +0200)]
Trivial bugfixes found during TROVE investigation.
Nick Mathewson [Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)]
Merge branch 'trove_2020_002_035' into trove_2020_002_041
Nick Mathewson [Tue, 17 Mar 2020 14:09:58 +0000 (10:09 -0400)]
Use >= consistently with max_bits.
Nick Mathewson [Tue, 17 Mar 2020 14:07:54 +0000 (10:07 -0400)]
Add off-by-one checks for key length.
Nick Mathewson [Tue, 17 Mar 2020 14:04:38 +0000 (10:04 -0400)]
Extract key length check into a new function, and check more fields.
In the openssl that I have, it should be safe to only check the size
of n. But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.
Issue spotted by Teor.
David Goulet [Tue, 17 Mar 2020 14:14:57 +0000 (10:14 -0400)]
sendme: Emit version 1 by default
Closes #33623
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Sat, 14 Mar 2020 18:44:33 +0000 (14:44 -0400)]
circpad_setup_machine_on_circ(): exit early on error.
This function does a nonfatal assertion to make sure that a machine
is not registered twice, but Tobias Pulls found a case where it
happens. Instead, make the function exit early so that it doesn't
cause a remotely triggered memory leak.
Fixes bug 33619; bugfix on 0.4.0.1-alpha. This is also tracked as
TROVE-2020-004.
Nick Mathewson [Mon, 16 Mar 2020 16:21:49 +0000 (12:21 -0400)]
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
Nick Mathewson [Mon, 16 Mar 2020 14:42:40 +0000 (10:42 -0400)]
Adjust unit tests for patch for 32672 (rejecting old version)
Patch by Neel Chauhan.
Nick Mathewson [Mon, 16 Mar 2020 14:40:55 +0000 (10:40 -0400)]
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
Neel Chauhan [Fri, 6 Dec 2019 00:06:35 +0000 (19:06 -0500)]
Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
teor [Mon, 16 Mar 2020 10:54:34 +0000 (20:54 +1000)]
Merge branch 'maint-0.4.2' into maint-0.4.3
teor [Mon, 16 Mar 2020 10:54:27 +0000 (20:54 +1000)]
Merge branch 'maint-0.4.1' into maint-0.4.2
teor [Mon, 16 Mar 2020 10:54:20 +0000 (20:54 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.1
teor [Mon, 17 Feb 2020 07:21:13 +0000 (17:21 +1000)]
Travis: Produce detailed chutney diagnostics
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.
Closes ticket 32792.
Nick Mathewson [Sat, 14 Mar 2020 18:20:51 +0000 (14:20 -0400)]
Merge branch 'trove_2020_002_035' into trove_2020_002_041
Nick Mathewson [Sat, 14 Mar 2020 18:17:33 +0000 (14:17 -0400)]
Fix memory leak in crypto_pk_asn1_decode_private.
(Deep, deep thanks to Taylor for reminding me to test this!)
Nick Mathewson [Sat, 14 Mar 2020 17:50:38 +0000 (13:50 -0400)]
Add a test for crypto_pk_asn1_decode_private maxbits.
Nick Mathewson [Sat, 14 Mar 2020 17:38:53 +0000 (13:38 -0400)]
Revise TROVE-2020-002 fix to work on older OpenSSL versions.
Although OpenSSL before 1.1.1 is no longer supported, it's possible
that somebody is still using it with 0.3.5, so we probably shouldn't
break it with this fix.
Nick Mathewson [Fri, 13 Mar 2020 20:57:27 +0000 (16:57 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
"ours" to avoid version bump.
Nick Mathewson [Fri, 13 Mar 2020 20:57:03 +0000 (16:57 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" to avoid version bump.
Nick Mathewson [Fri, 13 Mar 2020 20:56:44 +0000 (16:56 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.1
"ours" to avoid version bump.
Nick Mathewson [Fri, 13 Mar 2020 20:56:31 +0000 (16:56 -0400)]
Bump to 0.3.5.10
Nick Mathewson [Fri, 13 Mar 2020 20:56:22 +0000 (16:56 -0400)]
Bump to 0.4.1.9
Nick Mathewson [Fri, 13 Mar 2020 20:56:06 +0000 (16:56 -0400)]
Bump to 0.4.2.7.
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:46:09 +0000 (16:46 -0400)]
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
Nick Mathewson [Fri, 13 Mar 2020 20:45:17 +0000 (16:45 -0400)]
Merge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Fri, 13 Mar 2020 20:42:47 +0000 (16:42 -0400)]
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
teor [Fri, 13 Mar 2020 03:00:58 +0000 (13:00 +1000)]
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3
Nick Mathewson [Thu, 12 Mar 2020 17:42:42 +0000 (13:42 -0400)]
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
Nick Mathewson [Thu, 12 Mar 2020 17:42:17 +0000 (13:42 -0400)]
Fix unit tests that look at contactinfo logs.
Nick Mathewson [Thu, 12 Mar 2020 16:45:56 +0000 (12:45 -0400)]
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
Conflicts:
src/app/config/config.c
David Goulet [Tue, 18 Feb 2020 14:43:13 +0000 (09:43 -0500)]
config: Warn if ContactInfo is not set
Closes #33361
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Wed, 11 Mar 2020 14:35:47 +0000 (10:35 -0400)]
Merge branch 'bug33032_042' into bug33032_043
Nick Mathewson [Wed, 11 Mar 2020 14:35:47 +0000 (10:35 -0400)]
Merge branch 'bug33032_041' into bug33032_042
Nick Mathewson [Wed, 11 Mar 2020 14:35:46 +0000 (10:35 -0400)]
Merge branch 'maint-0.4.1' into bug33032_041
Nick Mathewson [Wed, 11 Mar 2020 13:40:04 +0000 (09:40 -0400)]
pem_decode(): Tolerate CRLF line endings
Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
Nick Mathewson [Tue, 10 Mar 2020 14:28:09 +0000 (10:28 -0400)]
Bump to 0.4.3.3-alpha.
rl1987 [Mon, 9 Mar 2020 18:51:46 +0000 (20:51 +0200)]
Tweak double-underscore
rl1987 [Mon, 9 Mar 2020 14:03:43 +0000 (16:03 +0200)]
Document poll_interval_tv in procmon.c
rl1987 [Mon, 9 Mar 2020 14:00:50 +0000 (16:00 +0200)]
Document __OwningControllerProcess torrc option and mention polling interval
Nick Mathewson [Wed, 26 Feb 2020 19:19:53 +0000 (14:19 -0500)]
changes file for ticket 33460.
Nick Mathewson [Wed, 26 Feb 2020 19:16:55 +0000 (14:16 -0500)]
In typed_var_kvassign, include config names in error messages.
This should improve the usability of our configuration error messages.
Nick Mathewson [Wed, 26 Feb 2020 17:40:53 +0000 (12:40 -0500)]
confmgt: when a units value is invalid, include a meaningful error.
Part of 33460.
Nick Mathewson [Wed, 26 Feb 2020 17:40:53 +0000 (12:40 -0500)]
confmgt: when an int/enum value is invalid, say which values are ok.
Part of 33460.
Nick Mathewson [Thu, 20 Feb 2020 15:44:36 +0000 (10:44 -0500)]
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
Nick Mathewson [Thu, 20 Feb 2020 13:48:17 +0000 (08:48 -0500)]
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
teor [Tue, 18 Feb 2020 22:22:01 +0000 (08:22 +1000)]
practracker: Read unicode files when using Python 2
Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.
We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.
Fixes bug 33374; bugfix on 0.4.3.1-alpha.
Nick Mathewson [Fri, 14 Feb 2020 13:16:22 +0000 (08:16 -0500)]
Merge branch 'ticket33290_v2_042' into maint-0.4.3
Nick Mathewson [Fri, 14 Feb 2020 13:16:01 +0000 (08:16 -0500)]
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
Nick Mathewson [Fri, 14 Feb 2020 13:15:37 +0000 (08:15 -0500)]
Wipe the entire hashent structure, not just the first sizeof(void*)
Nick Mathewson [Thu, 13 Feb 2020 15:47:32 +0000 (10:47 -0500)]
Merge branch 'ticket33290_v2_043' into maint-0.4.3
Nick Mathewson [Thu, 13 Feb 2020 14:21:47 +0000 (09:21 -0500)]
Merge branch 'ticket33290_v2_042' into ticket33290_v2_043
Conflicts:
src/core/or/circuitmux_ewma.c
Nick Mathewson [Thu, 13 Feb 2020 14:12:48 +0000 (09:12 -0500)]
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
Nick Mathewson [Thu, 13 Feb 2020 14:11:35 +0000 (09:11 -0500)]
Before freeing ewma objects, use memwipe instead of resetting magic.