]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 21 Sep 2020 16:59:03 +0000 (12:59 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 21 Sep 2020 16:59:03 +0000 (12:59 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agogitlab-ci: Use test-network-all for debian-integration
Nick Mathewson [Mon, 21 Sep 2020 13:49:29 +0000 (09:49 -0400)] 
gitlab-ci: Use test-network-all for debian-integration

5 years agogitlab-ci: add an NSS check.
Nick Mathewson [Mon, 21 Sep 2020 13:26:57 +0000 (09:26 -0400)] 
gitlab-ci: add an NSS check.

5 years agogitlab-ci: Add all-bugs-are-fatal on hardened and integration builds.
Nick Mathewson [Mon, 21 Sep 2020 13:25:02 +0000 (09:25 -0400)] 
gitlab-ci: Add all-bugs-are-fatal on hardened and integration builds.

5 years agogitlab-ci: Add disable-module builds.
Nick Mathewson [Mon, 21 Sep 2020 13:24:14 +0000 (09:24 -0400)] 
gitlab-ci: Add disable-module builds.

5 years agoAdd a few more options for the CI script.
Nick Mathewson [Mon, 21 Sep 2020 13:20:40 +0000 (09:20 -0400)] 
Add a few more options for the CI script.

These are:
  --disable-module-relay
  --disable-module-dirauth
  --enable-all-bugs-are-fatal
  --enable-nss

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Fri, 18 Sep 2020 23:06:16 +0000 (19:06 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Fri, 18 Sep 2020 23:06:16 +0000 (19:06 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMake debian-trace job conditional on src/lib/trace/trace_sys.c
Nick Mathewson [Fri, 18 Sep 2020 19:56:59 +0000 (15:56 -0400)] 
Make debian-trace job conditional on src/lib/trace/trace_sys.c

5 years ago.gitlab.yml: missing comments
Nick Mathewson [Fri, 18 Sep 2020 19:55:02 +0000 (15:55 -0400)] 
.gitlab.yml: missing comments

5 years agoCopy tracing things back to maint-0.3.5, for consistency.
Nick Mathewson [Fri, 18 Sep 2020 19:53:06 +0000 (15:53 -0400)] 
Copy tracing things back to maint-0.3.5, for consistency.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
David Goulet [Fri, 18 Sep 2020 13:45:25 +0000 (09:45 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Fri, 18 Sep 2020 13:45:25 +0000 (09:45 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoFix underflow in rend_cache/free_all test.
Nick Mathewson [Thu, 17 Sep 2020 18:04:54 +0000 (14:04 -0400)] 
Fix underflow in rend_cache/free_all test.

We already fixed these in #40099 and #40125.

This patch fixes #40126.  Bugfix on 0.2.8.1-alpha.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 17 Sep 2020 17:56:40 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Thu, 17 Sep 2020 17:56:40 +0000 (13:56 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agotest: Increment rend cache allocation before freeing
David Goulet [Thu, 17 Sep 2020 16:55:40 +0000 (12:55 -0400)] 
test: Increment rend cache allocation before freeing

The rend_cache/entry_free was missing the rend cache allocation increment
before freeing the object.

Without it, it had an underflow bug:

  Sep 17 08:40:13.845 [warn] rend_cache_decrement_allocation(): Bug: Underflow
  in rend_cache_decrement_allocation (on Tor 0.4.5.0-alpha-dev
  7eef9ced61e72b1d)

Fixes #40125

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoBump version to 0.4.4.5-dev.
Nick Mathewson [Tue, 15 Sep 2020 12:52:37 +0000 (08:52 -0400)] 
Bump version to 0.4.4.5-dev.

5 years agoBump version to 0.4.4.5
Nick Mathewson [Mon, 14 Sep 2020 17:17:37 +0000 (13:17 -0400)] 
Bump version to 0.4.4.5

5 years agostatistics: Properly count all rendezvous cells (avoid undercounting).
George Kadianakis [Mon, 7 Sep 2020 10:17:41 +0000 (13:17 +0300)] 
statistics: Properly count all rendezvous cells (avoid undercounting).

tl;dr We were not counting cells flying from the client to the service, but we
were counting cells flying from the service to the client.

When a rendezvous cell arrives from the client to the RP, the RP forwards it to
the service.

For this to happen, the cell first passes through command_process_relay_cell()
which normally does the statistics counting. However because the `rend_circ`
circuit was not flagged with `circuit_carries_hs_traffic_stats` in
rend_mid_rendezvous(), the cell is not counted there.

Then the cell goes to circuit_receive_relay_cell() which has a special code
block based on `rend_splice` specifically for rendezvous cells, and the cell
gets directly passed to `rend_circ` via a direct call to
circuit_receive_relay_cell(). The cell never passes through
command_process_relay_cell() ever again and hence is never counted by our
rephist module.

The fix here is to flag the `rend_circ` circuit with
`circuit_carries_hs_traffic_stats` so that the cell is counted as soon as it
hits command_process_relay_cell().

Furthermore we avoid double-counting cells since the special code block of
circuit_receive_relay_cell() makes us count rendezvous cells only as they enter
the RP and not as they exit it.

Fixes #40117.

5 years agoAvoid guard-related warning when upgrading from 043 to 044.
George Kadianakis [Tue, 25 Aug 2020 12:09:35 +0000 (15:09 +0300)] 
Avoid guard-related warning when upgrading from 043 to 044.

Fixes #40105.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4
George Kadianakis [Tue, 25 Aug 2020 11:51:05 +0000 (14:51 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4

5 years agov3 control: Persist ONION_CLIENT_AUTH_ADD client name
Neel Chauhan [Fri, 7 Aug 2020 05:32:30 +0000 (22:32 -0700)] 
v3 control: Persist ONION_CLIENT_AUTH_ADD client name

5 years agohs: Don't overwrite DoS parameters on circuit with consensus params
David Goulet [Wed, 19 Aug 2020 13:47:34 +0000 (09:47 -0400)] 
hs: Don't overwrite DoS parameters on circuit with consensus params

Turns out that the HS DoS defenses parameters were overwritten by the
consensus parameters everytime a new consensus would arrive.

This means that a service operator can still enable the defenses but as soon
as the intro point relay would get a new consensus, they would be overwritten.
And at this commit, the network is entirely disabling DoS defenses.

Fix this by introducing an "explicit" flag that indicate if the
ESTABLISH_INTRO cell DoS extension set those parameters or not. If set, avoid
using the consenus at once.

We are not bumping the protover HSIntro value for this because 0.4.2.x series
is EOL in 1 month and thus 0.4.3.x would be the only series with this bug. We
are confident that a backport and then upgrade path to the latest 0.4.4.x
stable coming up soon is enough to mitigate this problem in the coming months.

It avoids the upgrade path on the service side by keeping the requirement for
protover HSIntro=5.

Fixes #40109

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'mr/124' into maint-0.4.4
George Kadianakis [Wed, 19 Aug 2020 10:55:07 +0000 (13:55 +0300)] 
Merge branch 'mr/124' into maint-0.4.4

5 years agoParallelize src/test/test into chunks.
Nick Mathewson [Wed, 12 Aug 2020 16:36:54 +0000 (12:36 -0400)] 
Parallelize src/test/test into chunks.

First, we introduce a flag to teach src/test/test to split its work
into chunks.  Then we replace our invocation of src/test/test in our
"make check" target with a set of 8 scripts that invoke the first
8th of the tests, the second 8th, and so on.

This change makes our "make -kj4 check" target in our hardened
gitlab build more than twice as fast, since src/test/test was taking
the longest to finish.

Closes 40098.

5 years agoMerge branch 'tor-gitlab/mr/121' into maint-0.4.4
David Goulet [Tue, 18 Aug 2020 12:49:01 +0000 (08:49 -0400)] 
Merge branch 'tor-gitlab/mr/121' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2 maint-0.4.2
Nick Mathewson [Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
Nick Mathewson [Thu, 13 Aug 2020 18:20:27 +0000 (14:20 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5

5 years agoBump to 0.4.4.4-rc-dev
Nick Mathewson [Thu, 13 Aug 2020 13:43:54 +0000 (09:43 -0400)] 
Bump to 0.4.4.4-rc-dev

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 13 Aug 2020 00:21:04 +0000 (20:21 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 13 Aug 2020 00:21:04 +0000 (20:21 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 13 Aug 2020 00:21:04 +0000 (20:21 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoImprove comments in .gitlab-ci.yml
Nick Mathewson [Thu, 13 Aug 2020 00:20:58 +0000 (20:20 -0400)] 
Improve comments in .gitlab-ci.yml

5 years agoCI: Turn on stem with 044 and later.
Nick Mathewson [Thu, 13 Aug 2020 00:13:18 +0000 (20:13 -0400)] 
CI: Turn on stem with 044 and later.

5 years agoFix allocation counting in clean_v2_descs_as_dir test.
Nick Mathewson [Wed, 12 Aug 2020 18:25:46 +0000 (14:25 -0400)] 
Fix allocation counting in clean_v2_descs_as_dir test.

Without this fix, running this test on its own would fail.

Fixes bug 40099. Bugfix on ade5005853c17b3 in 0.2.8.1-alpha.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 12 Aug 2020 16:29:17 +0000 (12:29 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Wed, 12 Aug 2020 16:29:17 +0000 (12:29 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 12 Aug 2020 16:29:17 +0000 (12:29 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoCI: improve output when skipping doxygen
Nick Mathewson [Wed, 12 Aug 2020 16:13:56 +0000 (12:13 -0400)] 
CI: improve output when skipping doxygen

5 years agoTry disabling "make all" when checking docs.
Nick Mathewson [Wed, 12 Aug 2020 15:35:15 +0000 (11:35 -0400)] 
Try disabling "make all" when checking docs.

5 years agoCI: Try to enable integration tests, hardening, and clang.
Nick Mathewson [Wed, 12 Aug 2020 13:38:19 +0000 (09:38 -0400)] 
CI: Try to enable integration tests, hardening, and clang.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 12 Aug 2020 12:40:10 +0000 (08:40 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

"ours" merge to avoid MR 122 -- we already merged MR 123.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 12 Aug 2020 12:39:41 +0000 (08:39 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Wed, 12 Aug 2020 12:39:41 +0000 (08:39 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoCI: Remove VS2015 AppVeyor build
George Kadianakis [Wed, 12 Aug 2020 11:09:32 +0000 (14:09 +0300)] 
CI: Remove VS2015 AppVeyor build

5 years agoCI: Remove VS2015 AppVeyor build.
George Kadianakis [Wed, 12 Aug 2020 11:05:21 +0000 (14:05 +0300)] 
CI: Remove VS2015 AppVeyor build.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4
George Kadianakis [Wed, 12 Aug 2020 10:47:34 +0000 (13:47 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4
George Kadianakis [Wed, 12 Aug 2020 10:23:08 +0000 (13:23 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4

5 years agobump version to 0.4.4.4-rc
Nick Mathewson [Tue, 11 Aug 2020 21:46:44 +0000 (17:46 -0400)] 
bump version to 0.4.4.4-rc

5 years agoLower the minimum value for MaxMemInQueues to 64 MB for relays.
Nick Mathewson [Tue, 11 Aug 2020 21:01:49 +0000 (17:01 -0400)] 
Lower the minimum value for MaxMemInQueues to 64 MB for relays.

For clients, there is no minimum value; in both cases, we warn if
the value seems too low.

Closes ticket 24308.

5 years agoRename argument to compute_real_max_mem_in_queues()
Nick Mathewson [Tue, 11 Aug 2020 16:59:07 +0000 (12:59 -0400)] 
Rename argument to compute_real_max_mem_in_queues()

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 16:40:02 +0000 (12:40 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 11 Aug 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Tue, 11 Aug 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoCI: label our python versions.
Nick Mathewson [Tue, 11 Aug 2020 16:24:03 +0000 (12:24 -0400)] 
CI: label our python versions.

5 years agoCI: Only run doxygen on 0.4.3 and later.
Nick Mathewson [Tue, 11 Aug 2020 16:22:35 +0000 (12:22 -0400)] 
CI: Only run doxygen on 0.4.3 and later.

5 years agoCI: enable documentation testing
Nick Mathewson [Tue, 11 Aug 2020 15:06:21 +0000 (11:06 -0400)] 
CI: enable documentation testing

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 11 Aug 2020 15:03:24 +0000 (11:03 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Tue, 11 Aug 2020 15:03:24 +0000 (11:03 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 15:03:24 +0000 (11:03 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoFix a pair of typos in ci-driver.sh.
Nick Mathewson [Tue, 11 Aug 2020 15:03:11 +0000 (11:03 -0400)] 
Fix a pair of typos in ci-driver.sh.

5 years agoFix "run_check_subsystem_order.sh" to use $PYTHON.
Nick Mathewson [Tue, 11 Aug 2020 15:01:31 +0000 (11:01 -0400)] 
Fix "run_check_subsystem_order.sh" to use $PYTHON.

Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.

Fixes bug 40095; bugfix on 0.4.4.1-alpha.

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 11 Aug 2020 14:44:40 +0000 (10:44 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Tue, 11 Aug 2020 14:44:40 +0000 (10:44 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Tue, 11 Aug 2020 14:44:40 +0000 (10:44 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoAdd a pair of warnings about only editing CI in 035
Nick Mathewson [Tue, 11 Aug 2020 14:44:32 +0000 (10:44 -0400)] 
Add a pair of warnings about only editing CI in 035

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4
George Kadianakis [Tue, 11 Aug 2020 11:53:03 +0000 (14:53 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4

5 years agoRemove a BUG() that could normally trigger in edge-cases.
George Kadianakis [Tue, 11 Aug 2020 11:34:06 +0000 (14:34 +0300)] 
Remove a BUG() that could normally trigger in edge-cases.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 10 Aug 2020 23:33:07 +0000 (19:33 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Mon, 10 Aug 2020 23:33:06 +0000 (19:33 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Mon, 10 Aug 2020 23:32:49 +0000 (19:32 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agosmall code tweaks to try to work around debian stable complaints
Nick Mathewson [Mon, 10 Aug 2020 21:36:21 +0000 (17:36 -0400)] 
small code tweaks to try to work around debian stable complaints

5 years agoTry to set up a minimal gitlab CI script
Nick Mathewson [Mon, 10 Aug 2020 20:10:12 +0000 (16:10 -0400)] 
Try to set up a minimal gitlab CI script

This is based on @eighthave's templates, and the work we've been
doing to present a uniform testing environment.

5 years agoAdd a shareable continuous-integration script.
Nick Mathewson [Mon, 10 Aug 2020 19:58:28 +0000 (15:58 -0400)] 
Add a shareable continuous-integration script.

Eventually this should be used by every one of our CI scripts.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 6 Aug 2020 17:24:12 +0000 (13:24 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 6 Aug 2020 17:24:11 +0000 (13:24 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 6 Aug 2020 17:24:11 +0000 (13:24 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoCopy from master gitlab-ci.yml from master back to maint-0.3.5
Nick Mathewson [Thu, 6 Aug 2020 16:42:14 +0000 (12:42 -0400)] 
Copy from master gitlab-ci.yml from master back to maint-0.3.5

5 years agoMerge branch 'bug40083_035' into bug40083_042
Nick Mathewson [Tue, 4 Aug 2020 17:10:16 +0000 (13:10 -0400)] 
Merge branch 'bug40083_035' into bug40083_042

Fixes conflicts due to code movement.

5 years agoLaunch early reachability tests once a minute, not once a second.
Nick Mathewson [Tue, 4 Aug 2020 16:59:49 +0000 (12:59 -0400)] 
Launch early reachability tests once a minute, not once a second.

This fixes bug 40083, which was introduced in 9f31908a in
0.2.8.1-alpha.

5 years agoMerge branch 'ticket40081_035' into ticket40081_044
Nick Mathewson [Mon, 3 Aug 2020 15:49:09 +0000 (11:49 -0400)] 
Merge branch 'ticket40081_035' into ticket40081_044

Resolves conflicts:
src/core/or/channel.c
        src/test/test_channel.c

5 years agoRemove channel_is_canonical_is_reliable()
Nick Mathewson [Mon, 3 Aug 2020 15:25:37 +0000 (11:25 -0400)] 
Remove channel_is_canonical_is_reliable()

This function once served to let circuits continue to be built over
version-1 link connections.  But such connections are long-obsolete,
and it's time to remove this check.

Closes #40081.

5 years agoWipe address strings from connections before freeing them them.
Nick Mathewson [Mon, 3 Aug 2020 14:15:08 +0000 (10:15 -0400)] 
Wipe address strings from connections before freeing them them.

This is a defense-in-depth fix; closes 6198.

5 years agoAdd a tor_str_wipe_and_free() function.
Nick Mathewson [Mon, 3 Aug 2020 14:11:03 +0000 (10:11 -0400)] 
Add a tor_str_wipe_and_free() function.

Frequently we want to do

    if (s) {
      memwipe(s, 0, sizeof(s));
      tor_free(s);
    }

and it's good to have a way to do this concisely.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
George Kadianakis [Mon, 3 Aug 2020 13:48:52 +0000 (16:48 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Alexander Færøy [Fri, 31 Jul 2020 02:03:35 +0000 (02:03 +0000)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Alexander Færøy [Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Alexander Færøy [Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'bug40076_043' into bug40076_044
Nick Mathewson [Thu, 30 Jul 2020 18:28:11 +0000 (14:28 -0400)] 
Merge branch 'bug40076_043' into bug40076_044

5 years agoMerge branch 'bug40076_042' into bug40076_043
Nick Mathewson [Thu, 30 Jul 2020 18:27:29 +0000 (14:27 -0400)] 
Merge branch 'bug40076_042' into bug40076_043

5 years agoMerge branch 'maint-0.4.2' into bug40076_042
Nick Mathewson [Thu, 30 Jul 2020 18:27:29 +0000 (14:27 -0400)] 
Merge branch 'maint-0.4.2' into bug40076_042

5 years agoFix a bug in buf_move_all() when the input buffer is empty.
Nick Mathewson [Thu, 30 Jul 2020 18:24:25 +0000 (14:24 -0400)] 
Fix a bug in buf_move_all() when the input buffer is empty.

We found this in #40076, after we started using buf_move_all() in
more places.  Fixes bug #40076; bugfix on 0.3.3.1-alpha.  As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".

5 years agoAdd unit test for buf_move_all(), including a failing case
Nick Mathewson [Thu, 30 Jul 2020 18:19:32 +0000 (14:19 -0400)] 
Add unit test for buf_move_all(), including a failing case

The failing case is #if'd out for now, but will be fixed in the next
commit.

Testing for a fix for #40076.

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 29 Jul 2020 16:37:08 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 29 Jul 2020 16:37:07 +0000 (12:37 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3