]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMerge branch 'maint-0.2.5' into release-0.2.5 release-0.2.5
Nick Mathewson [Thu, 5 Apr 2018 12:22:33 +0000 (08:22 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the April 3 2018 database. maint-0.2.5
Karsten Loesing [Thu, 5 Apr 2018 08:42:25 +0000 (10:42 +0200)] 
Update geoip and geoip6 to the April 3 2018 database.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Mon, 19 Mar 2018 09:42:43 +0000 (05:42 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoMerge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
Nick Mathewson [Mon, 19 Mar 2018 09:42:38 +0000 (05:42 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Tue, 13 Mar 2018 14:58:02 +0000 (10:58 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the March 8 2018 database.
Karsten Loesing [Mon, 12 Mar 2018 13:47:06 +0000 (14:47 +0100)] 
Update geoip and geoip6 to the March 8 2018 database.

7 years agoDocument how to allow partial Travis failures
Taylor Yu [Wed, 28 Feb 2018 18:28:45 +0000 (12:28 -0600)] 
Document how to allow partial Travis failures

Add some commented-out allow_failures clauses to make it easier to
temporarily allow less-critical sub-builds to fail while still
reporting success.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 8 Feb 2018 15:29:05 +0000 (10:29 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the February 7 2018 database.
Karsten Loesing [Thu, 8 Feb 2018 09:32:41 +0000 (10:32 +0100)] 
Update geoip and geoip6 to the February 7 2018 database.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Fri, 19 Jan 2018 15:18:59 +0000 (10:18 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoWork around Travis CI ptrace regression
Taylor Yu [Wed, 10 Jan 2018 20:52:04 +0000 (14:52 -0600)] 
Work around Travis CI ptrace regression

Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly.  Set "sudo: required" to force non-container builds for
clang and work around this.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Mon, 8 Jan 2018 14:34:56 +0000 (09:34 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the January 5 2018 database.
Karsten Loesing [Mon, 8 Jan 2018 10:36:38 +0000 (11:36 +0100)] 
Update geoip and geoip6 to the January 5 2018 database.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 21 Dec 2017 15:58:20 +0000 (10:58 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoMerge branch 'bug24666_squashed_025' into maint-0.2.5
Nick Mathewson [Thu, 21 Dec 2017 15:40:10 +0000 (10:40 -0500)] 
Merge branch 'bug24666_squashed_025' into maint-0.2.5

7 years agoMove free to end of test function so coverity won't complain.
Nick Mathewson [Thu, 21 Dec 2017 15:39:29 +0000 (10:39 -0500)] 
Move free to end of test function so coverity won't complain.

7 years agoMove destroy cells into a separate queue type of their own, to save RAM
Nick Mathewson [Tue, 19 Dec 2017 18:53:52 +0000 (13:53 -0500)] 
Move destroy cells into a separate queue type of their own, to save RAM

We've been seeing problems with destroy cells queues taking up a
huge amount of RAM.  We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.

Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Wed, 20 Dec 2017 17:15:23 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the December 6 2017 database.
Karsten Loesing [Wed, 20 Dec 2017 16:36:29 +0000 (17:36 +0100)] 
Update geoip and geoip6 to the December 6 2017 database.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoMerge branch 'bug24167_025' into maint-0.2.5
Nick Mathewson [Mon, 11 Dec 2017 21:56:28 +0000 (16:56 -0500)] 
Merge branch 'bug24167_025' into maint-0.2.5

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Mon, 11 Dec 2017 21:53:07 +0000 (16:53 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoMerge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
Nick Mathewson [Mon, 11 Dec 2017 21:53:02 +0000 (16:53 -0500)] 
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Fri, 1 Dec 2017 17:13:39 +0000 (12:13 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoFix a clang compilation warning in rendservice.c
Nick Mathewson [Fri, 1 Dec 2017 17:13:15 +0000 (12:13 -0500)] 
Fix a clang compilation warning in rendservice.c

Fixes bug 24480; bugfix on 0.2.5.16.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Fri, 1 Dec 2017 14:35:43 +0000 (09:35 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agobump to 0.2.5.16-dev
Nick Mathewson [Fri, 1 Dec 2017 14:33:41 +0000 (09:33 -0500)] 
bump to 0.2.5.16-dev

7 years agocopy changelog to releasenotes
Nick Mathewson [Fri, 1 Dec 2017 14:14:18 +0000 (09:14 -0500)] 
copy changelog to releasenotes

7 years agochangelog for 0.2.5.16 tor-0.2.5.16
Nick Mathewson [Thu, 30 Nov 2017 20:26:33 +0000 (15:26 -0500)] 
changelog for 0.2.5.16

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:28:39 +0000 (12:28 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agobump to 0.2.5.16
Nick Mathewson [Thu, 30 Nov 2017 17:19:48 +0000 (12:19 -0500)] 
bump to 0.2.5.16

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoMerge branch 'trove-2017-012_025' into maint-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:06:21 +0000 (12:06 -0500)] 
Merge branch 'trove-2017-012_025' into maint-0.2.5

7 years agoMerge branch 'trove-2017-011_025' into maint-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:06:17 +0000 (12:06 -0500)] 
Merge branch 'trove-2017-011_025' into maint-0.2.5

7 years agoMerge branch 'trove-2017-009_025' into maint-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:05:59 +0000 (12:05 -0500)] 
Merge branch 'trove-2017-009_025' into maint-0.2.5

7 years agoFix changes file
Nick Mathewson [Thu, 30 Nov 2017 16:52:40 +0000 (11:52 -0500)] 
Fix changes file

7 years agoUse local descriptor object to exclude self in path selection
David Goulet [Wed, 29 Nov 2017 00:02:00 +0000 (19:02 -0500)] 
Use local descriptor object to exclude self in path selection

TROVE-2017-12. Severity: Medium

When choosing a random node for a circuit, directly use our router
descriptor to exclude ourself instead of the one in the global
descriptor list. That list could be empty because tor could be
downloading them which could lead to not excluding ourself.

Closes #21534

7 years agoAvoid asking for passphrase on junky PEM input
Nick Mathewson [Sat, 11 Nov 2017 19:21:37 +0000 (14:21 -0500)] 
Avoid asking for passphrase on junky PEM input

Fixes bug 24246 and TROVE-2017-011.

This bug is so old, it's in Matej's code.  Seems to have been
introduced with e01522bbed6eea.

7 years agoFix length of replaycache-checked data.
Nick Mathewson [Sat, 11 Nov 2017 18:40:21 +0000 (13:40 -0500)] 
Fix length of replaycache-checked data.

This is a regression; we should have been checking only the
public-key encrypted portion.  Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.

7 years agorelay: Change bandwidth stats interval to 24 hours
David Goulet [Wed, 22 Nov 2017 14:25:07 +0000 (09:25 -0500)] 
relay: Change bandwidth stats interval to 24 hours

Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.

Closes #23856

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Sat, 18 Nov 2017 16:03:16 +0000 (11:03 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoMerge branch 'ticket18329_minimal_025' into maint-0.2.5
Nick Mathewson [Sat, 18 Nov 2017 16:00:45 +0000 (11:00 -0500)] 
Merge branch 'ticket18329_minimal_025' into maint-0.2.5

7 years agoFix a traceback when closing a blocked connection "immediately".
Nick Mathewson [Thu, 16 Nov 2017 16:45:15 +0000 (11:45 -0500)] 
Fix a traceback when closing a blocked connection "immediately".

When we close a connection via connection_close_immediately, we kill
its events immediately. But if it had been blocked on bandwidth
read/write, we could try to re-add its (nonexistent) events later
from connection_bucket_refill -- if we got to that callback before
we swept the marked connections.

Fixes bug 24167.  Fortunately, this hasn't been a crash bug since we
introduced connection_check_event in 0.2.9.10, and backported it.

This is a bugfix on commit 89d422914a0c3cb, I believe, which
appeared in Tor 0.1.0.1-rc.

7 years agoMinimal implementation of bridge-distribution-request
Nick Mathewson [Tue, 14 Nov 2017 01:44:51 +0000 (20:44 -0500)] 
Minimal implementation of bridge-distribution-request

Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.

This is done in lieu of a full backport of #18329.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the November 6 2017 database.
Karsten Loesing [Fri, 10 Nov 2017 09:14:09 +0000 (10:14 +0100)] 
Update geoip and geoip6 to the November 6 2017 database.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Wed, 25 Oct 2017 13:29:00 +0000 (09:29 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agobump to 0.2.5.15-dev
Nick Mathewson [Wed, 25 Oct 2017 13:26:53 +0000 (09:26 -0400)] 
bump to 0.2.5.15-dev

7 years agoSet a date; make releasenotes (025) tor-0.2.5.15
Nick Mathewson [Wed, 25 Oct 2017 12:07:19 +0000 (08:07 -0400)] 
Set a date; make releasenotes (025)

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Tue, 24 Oct 2017 13:10:42 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agobump to 0.2.5.15
Nick Mathewson [Tue, 24 Oct 2017 13:09:00 +0000 (09:09 -0400)] 
bump to 0.2.5.15

7 years agoWarn that 025 will become deprecated next may.
Nick Mathewson [Tue, 24 Oct 2017 13:05:23 +0000 (09:05 -0400)] 
Warn that 025 will become deprecated next may.

7 years agobegin a changelog for 0.2.5.15
Nick Mathewson [Tue, 24 Oct 2017 13:01:43 +0000 (09:01 -0400)] 
begin a changelog for 0.2.5.15

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Mon, 23 Oct 2017 13:03:58 +0000 (09:03 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agodirauth: Add bastet to the default authorities
David Goulet [Thu, 19 Oct 2017 20:08:43 +0000 (16:08 -0400)] 
dirauth: Add bastet to the default authorities

Fixes #23910

Based on a patch by dgoulet; backported to 0.2.5

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Mon, 23 Oct 2017 12:57:22 +0000 (08:57 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate Longclaw's IP address; fixes 23592.
Nick Mathewson [Tue, 17 Oct 2017 17:59:00 +0000 (13:59 -0400)] 
Update Longclaw's IP address; fixes 23592.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 5 Oct 2017 15:04:59 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoadd missing subcategory in changes file
Nick Mathewson [Thu, 5 Oct 2017 15:04:54 +0000 (11:04 -0400)] 
add missing subcategory in changes file

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 5 Oct 2017 15:03:35 +0000 (11:03 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the October 4 2017 database.
Karsten Loesing [Thu, 5 Oct 2017 14:56:14 +0000 (16:56 +0200)] 
Update geoip and geoip6 to the October 4 2017 database.

7 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 7 Sep 2017 19:18:00 +0000 (15:18 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

7 years agoUpdate geoip and geoip6 to the September 6 2017 database.
Karsten Loesing [Thu, 7 Sep 2017 19:06:16 +0000 (21:06 +0200)] 
Update geoip and geoip6 to the September 6 2017 database.

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoUpdate geoip and geoip6 to the August 3 2017 database.
Karsten Loesing [Thu, 3 Aug 2017 08:00:54 +0000 (10:00 +0200)] 
Update geoip and geoip6 to the August 3 2017 database.

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Tue, 1 Aug 2017 15:19:28 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 1 Aug 2017 15:19:28 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4 maint-0.2.4
Nick Mathewson [Tue, 1 Aug 2017 15:19:24 +0000 (11:19 -0400)] 
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoPoint travis to #tor-ci, not #tor-bots
Nick Mathewson [Wed, 26 Jul 2017 19:39:50 +0000 (15:39 -0400)] 
Point travis to #tor-ci, not #tor-bots

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:38:48 +0000 (15:38 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:34:40 +0000 (15:34 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoIn < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.
Isis Lovecruft [Tue, 25 Jul 2017 01:03:15 +0000 (01:03 +0000)] 
In < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.

8 years agoBuilds on CI should use --enable-fragile-hardening.
Isis Lovecruft [Mon, 24 Jul 2017 23:07:09 +0000 (23:07 +0000)] 
Builds on CI should use --enable-fragile-hardening.

(cherry picked from commit c91a57ccf90308c6728184b43519f96b61acb95d)

8 years agoInstall optional dependencies during Travis CI builds.
Isis Lovecruft [Mon, 24 Jul 2017 18:53:18 +0000 (18:53 +0000)] 
Install optional dependencies during Travis CI builds.

(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04)

8 years agoFix CI homebrew checks for outdated packages.
Isis Lovecruft [Mon, 24 Jul 2017 18:26:36 +0000 (18:26 +0000)] 
Fix CI homebrew checks for outdated packages.

(cherry picked from commit 8f8689f70235dc19cbc5092ea148af5772a9cdc3)

8 years agoAdd a changes file for bug22636.
Isis Lovecruft [Wed, 12 Jul 2017 00:32:38 +0000 (00:32 +0000)] 
Add a changes file for bug22636.

8 years agoFix and expand upon our Travis CI configuration.
Isis Lovecruft [Tue, 11 Jul 2017 20:12:15 +0000 (20:12 +0000)] 
Fix and expand upon our Travis CI configuration.

 * CHANGE .travis.yml so that commands for different purposes (e.g. getting
   dependencies, building, testing) are in separate config lines and sections.
 * CHANGE .travis.yml to use their mechanism for installing dependencies via
   apt. [0]  This also allows us to not need sudo (the "sudo: false" line).
 * CHANGE Travis CI tests (the "script:" section) to build and run tests in the
   same manner as Jenkins (i.e. with --enable-fatal-warnings and
   --disable-silent-rules and run `make check`).
 * ADD Travis configuration to do all the target builds with both GCC and clang.
 * ADD make flags to build with both of the cores available.
 * ADD notifications for IRC, and configure email notifications (to the author
   of the commit) only if the branch was previously building successfully and
   the latest commit broke it.
 * ADD the ability to run the Travis build matrix for OSX as well, but leave it
   commented out by default (because it takes roughly ten times longer, due to a
   shortage of OSX build machines).
 * ADD Travis config option to cancel/fail the build early if one target has
   already failed ("fast_finish: true").
 * ADD comments to describe what our Travis config is doing and why it is
   configured that way.

[0]: https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-on-Container-Based-Infrastructure)

8 years ago.travis.yml to run test suite
Patrick O'Doherty [Sun, 2 Jul 2017 21:28:52 +0000 (14:28 -0700)] 
.travis.yml to run test suite

Installs dependencies (including rust) and runs the existing test suite.

TODO: Introduce build matrix utilizing the rust toolchain to run test
suites both with and without the rust components.

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMention TROVE-2017-007 in changes file for 22789
Nick Mathewson [Fri, 7 Jul 2017 14:51:25 +0000 (10:51 -0400)] 
Mention TROVE-2017-007 in changes file for 22789

8 years agoUpdate geoip and geoip6 to the July 4 2017 database.
Karsten Loesing [Fri, 7 Jul 2017 14:27:54 +0000 (16:27 +0200)] 
Update geoip and geoip6 to the July 4 2017 database.

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Wed, 5 Jul 2017 17:43:31 +0000 (13:43 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 5 Jul 2017 17:42:26 +0000 (13:42 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'bug22789_024' into maint-0.2.4
Nick Mathewson [Wed, 5 Jul 2017 17:41:27 +0000 (13:41 -0400)] 
Merge branch 'bug22789_024' into maint-0.2.4

8 years agoFix assertion failure related to openbsd strtol().
Nick Mathewson [Mon, 3 Jul 2017 15:20:09 +0000 (11:20 -0400)] 
Fix assertion failure related to openbsd strtol().

Fixes bug 22789; bugfix on 0.2.3.8-alpha.

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'bug22737_024' into maint-0.2.4
Nick Mathewson [Tue, 27 Jun 2017 15:04:41 +0000 (11:04 -0400)] 
Merge branch 'bug22737_024' into maint-0.2.4

8 years agoFix an errant memset() into the middle of a struct in cell_pack().
Nick Mathewson [Tue, 27 Jun 2017 14:45:29 +0000 (10:45 -0400)] 
Fix an errant memset() into the middle of a struct in cell_pack().

This mistake causes two possible bugs. I believe they are both
harmless IRL.

BUG 1: memory stomping

When we call the memset, we are overwriting two 0 bytes past the end
of packed_cell_t.body. But I think that's harmless in practice,
because the definition of packed_cell_t is:

// ...
typedef struct packed_cell_t {
  TOR_SIMPLEQ_ENTRY(packed_cell_t) next;
  char body[CELL_MAX_NETWORK_SIZE];
  uint32_t inserted_time;
} packed_cell_t;

So we will overwrite either two bytes of inserted_time, or two bytes
of padding, depending on how the platform handles alignment.

If we're overwriting padding, that's safe.

If we are overwriting the inserted_time field, that's also safe: In
every case where we call cell_pack() from connection_or.c, we ignore
the inserted_time field. When we call cell_pack() from relay.c, we
don't set or use inserted_time until right after we have called
cell_pack(). SO I believe we're safe in that case too.

BUG 2: memory exposure

The original reason for this memset was to avoid the possibility of
accidentally leaking uninitialized ram to the network. Now
remember, if wide_circ_ids is false on a connection, we shouldn't
actually be sending more than 512 bytes of packed_cell_t.body, so
these two bytes can only leak to the network if there is another bug
somewhere else in the code that sends more data than is correct.

Fortunately, in relay.c, where we allocate packed_cell_t in
packed_cell_new() , we allocate it with tor_malloc_zero(), which
clears the RAM, right before we call cell_pack. So those
packed_cell_t.body bytes can't leak any information.

That leaves the two calls to cell_pack() in connection_or.c, which
use stack-alocated packed_cell_t instances.

In or_handshake_state_record_cell(), we pass the cell's contents to
crypto_digest_add_bytes(). When we do so, we get the number of
bytes to pass using the same setting of wide_circ_ids as we passed
to cell_pack(). So I believe that's safe.

In connection_or_write_cell_to_buf(), we also use the same setting
of wide_circ_ids in both calls. So I believe that's safe too.

I introduced this bug with 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2
back in 0.2.4.11-alpha; it is bug 22737 and CID 1401591

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the June 8 2017 database.
Karsten Loesing [Fri, 9 Jun 2017 13:47:49 +0000 (15:47 +0200)] 
Update geoip and geoip6 to the June 8 2017 database.

8 years agoMerge branch 'maint-0.2.5' into release-0.2.5
Nick Mathewson [Thu, 8 Jun 2017 18:06:56 +0000 (14:06 -0400)] 
Merge branch 'maint-0.2.5' into release-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 8 Jun 2017 18:05:37 +0000 (14:05 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid version bump.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:13 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:08 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agochangelog for 0.2.5.14 tor-0.2.5.14
Nick Mathewson [Thu, 8 Jun 2017 13:47:44 +0000 (09:47 -0400)] 
changelog for 0.2.5.14