]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7 maint-0.2.7
Nick Mathewson [Wed, 15 Feb 2017 12:52:41 +0000 (07:52 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 15 Feb 2017 12:52:33 +0000 (07:52 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7
Nick Mathewson [Wed, 15 Feb 2017 12:51:48 +0000 (07:51 -0500)] 
Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7

8 years agoMerge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6
Nick Mathewson [Wed, 15 Feb 2017 12:51:41 +0000 (07:51 -0500)] 
Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6

8 years agoMerge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5
Nick Mathewson [Wed, 15 Feb 2017 12:51:33 +0000 (07:51 -0500)] 
Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Wed, 15 Feb 2017 12:47:21 +0000 (07:47 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 15 Feb 2017 12:47:12 +0000 (07:47 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 15 Feb 2017 12:47:04 +0000 (07:47 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoAvoid integer underflow in tor_version_compare.
Nick Mathewson [Tue, 7 Feb 2017 15:58:02 +0000 (10:58 -0500)] 
Avoid integer underflow in tor_version_compare.

Fix for TROVE-2017-001 and bug 21278.

(Note: Instead of handling signed ints "correctly", we keep the old
behavior, except for the part where we would crash with -ftrapv.)

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Roger Dingledine [Mon, 13 Feb 2017 20:28:50 +0000 (15:28 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Roger Dingledine [Mon, 13 Feb 2017 20:27:57 +0000 (15:27 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Roger Dingledine [Mon, 13 Feb 2017 20:23:50 +0000 (15:23 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agobe sure to remember the changes file for #20384
Roger Dingledine [Mon, 13 Feb 2017 20:22:36 +0000 (15:22 -0500)] 
be sure to remember the changes file for #20384

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Mon, 13 Feb 2017 19:37:49 +0000 (14:37 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 13 Feb 2017 19:37:42 +0000 (14:37 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 13 Feb 2017 19:37:01 +0000 (14:37 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the February 8 2017 database.
Karsten Loesing [Sun, 12 Feb 2017 14:56:31 +0000 (15:56 +0100)] 
Update geoip and geoip6 to the February 8 2017 database.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 7 Feb 2017 15:39:03 +0000 (10:39 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 7 Feb 2017 15:37:53 +0000 (10:37 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge remote-tracking branch 'public/bug18710_025' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 15:37:43 +0000 (10:37 -0500)] 
Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 15:37:31 +0000 (10:37 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoDisable a log_backtrace (which 0.2.4 does not have) in 16248 fix
Nick Mathewson [Tue, 7 Feb 2017 14:49:23 +0000 (09:49 -0500)] 
Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix

8 years agoAdd comments to connection_check_event().
Nick Mathewson [Mon, 14 Mar 2016 16:53:21 +0000 (12:53 -0400)] 
Add comments to connection_check_event().

8 years agoChange behavior on missing/present event to warn instead of asserting.
Nick Mathewson [Fri, 11 Mar 2016 15:50:36 +0000 (10:50 -0500)] 
Change behavior on missing/present event to warn instead of asserting.

Add a changes file.

8 years agoIf we start/stop reading on a dnsserv connection, don't assert.
Nick Mathewson [Fri, 11 Mar 2016 15:33:19 +0000 (10:33 -0500)] 
If we start/stop reading on a dnsserv connection, don't assert.

Fixes bug 16248. Patch from cypherpunks.  Bugfix on 0.2.0.1-alpha.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 7 Feb 2017 14:29:27 +0000 (09:29 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

"ours" merge to avoid reverting 17354, which was already fixed in
0.2.7.4-rc.

8 years agoRevert "Add hidserv-stats filname to our sandbox filter"
Nick Mathewson [Tue, 7 Feb 2017 14:28:50 +0000 (09:28 -0500)] 
Revert "Add hidserv-stats filname to our sandbox filter"

Reverting this in 0.2.6 only -- we're no backporting
seccomp2-loosening fixes to 0.2.6.

This reverts commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 7 Feb 2017 14:20:13 +0000 (09:20 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 7 Feb 2017 14:18:54 +0000 (09:18 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 14:17:59 +0000 (09:17 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoBackport the tonga->bifroest move to 0.2.4.
Nick Mathewson [Tue, 7 Feb 2017 14:15:21 +0000 (09:15 -0500)] 
Backport the tonga->bifroest move to 0.2.4.

This is a backport of 19728 and 19690

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 7 Feb 2017 13:55:07 +0000 (08:55 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 7 Feb 2017 13:54:54 +0000 (08:54 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 13:54:47 +0000 (08:54 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4
Nick Mathewson [Tue, 7 Feb 2017 13:47:11 +0000 (08:47 -0500)] 
Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 7 Feb 2017 13:39:25 +0000 (08:39 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 7 Feb 2017 13:39:07 +0000 (08:39 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 13:38:59 +0000 (08:38 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge remote-tracking branch 'public/bug17404_024' into maint-0.2.4
Nick Mathewson [Tue, 7 Feb 2017 13:37:07 +0000 (08:37 -0500)] 
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 7 Feb 2017 13:34:37 +0000 (08:34 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 13:34:08 +0000 (08:34 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoRefine the memwipe() arguments check for 18089 a little more.
Nick Mathewson [Tue, 19 Jan 2016 13:28:58 +0000 (08:28 -0500)] 
Refine the memwipe() arguments check for 18089 a little more.

We still silently ignore
     memwipe(NULL, ch, 0);
and
     memwipe(ptr, ch, 0);  /* for ptr != NULL */

But we now assert on:
     memwipe(NULL, ch, 30);

8 years agoMake memwipe() do nothing when passed a NULL pointer or zero size
teor (Tim Wilson-Brown) [Tue, 19 Jan 2016 00:22:58 +0000 (11:22 +1100)] 
Make memwipe() do nothing when passed a NULL pointer or zero size

Check size argument to memwipe() for underflow.

Closes bug #18089. Reported by "gk", patch by "teor".
Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352),
commit 49dd5ef3 on 7 Nov 2012.

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 7 Feb 2017 13:32:10 +0000 (08:32 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoFix out-of-bounds read in INTRODUCE2 client auth
John Brooks [Sun, 26 Apr 2015 04:52:35 +0000 (22:52 -0600)] 
Fix out-of-bounds read in INTRODUCE2 client auth

The length of auth_data from an INTRODUCE2 cell is checked when the
auth_type is recognized (1 or 2), but not for any other non-zero
auth_type. Later, auth_data is assumed to have at least
REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds
read.

Fixed by checking auth_len before comparing the descriptor cookie
against known clients.

Fixes #15823; bugfix on 0.2.1.6-alpha.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Wed, 11 Jan 2017 14:12:51 +0000 (09:12 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 11 Jan 2017 14:12:21 +0000 (09:12 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 11 Jan 2017 14:11:58 +0000 (09:11 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the January 4 2017 database.
Karsten Loesing [Wed, 4 Jan 2017 09:19:52 +0000 (10:19 +0100)] 
Update geoip and geoip6 to the January 4 2017 database.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 20 Dec 2016 23:23:19 +0000 (18:23 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoAdd a one-word sentinel value of 0x0 at the end of each buf_t chunk
Nick Mathewson [Fri, 14 Oct 2016 13:38:12 +0000 (09:38 -0400)] 
Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.

It also closes TROVE-2016-10-001 (aka bug 20384).

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 20 Dec 2016 23:22:27 +0000 (18:22 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

("ours" merge because there is a separate 20384 patch for 026)

8 years agoAdd a one-word sentinel value of 0x0 at the end of each buf_t chunk
Nick Mathewson [Fri, 14 Oct 2016 13:38:12 +0000 (09:38 -0400)] 
Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 20 Dec 2016 23:19:41 +0000 (18:19 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

(ours merge -- there is a separate 0.2.5 patch for 20384.)

8 years agoAdd a one-word sentinel value of 0x0 at the end of each buf_t chunk
Nick Mathewson [Fri, 14 Oct 2016 13:38:12 +0000 (09:38 -0400)] 
Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 20 Dec 2016 23:14:21 +0000 (18:14 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 20 Dec 2016 23:11:25 +0000 (18:11 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 20 Dec 2016 23:11:08 +0000 (18:11 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMake log message warn about detected attempts to exploit 21018.
Nick Mathewson [Mon, 19 Dec 2016 01:17:28 +0000 (20:17 -0500)] 
Make log message warn about detected attempts to exploit 21018.

8 years agoFix parsing bug with unecognized token at EOS
Nick Mathewson [Mon, 19 Dec 2016 01:13:58 +0000 (20:13 -0500)] 
Fix parsing bug with unecognized token at EOS

In get_token(), we could read one byte past the end of the
region. This is only a big problem in the case where the region
itself is (a) potentially hostile, and (b) not explicitly
nul-terminated.

This patch fixes the underlying bug, and also makes sure that the
one remaining case of not-NUL-terminated potentially hostile data
gets NUL-terminated.

Fix for bug 21018, TROVE-2016-12-002, and CVE-2016-1254

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Fri, 9 Dec 2016 13:34:12 +0000 (08:34 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Fri, 9 Dec 2016 13:34:06 +0000 (08:34 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 9 Dec 2016 13:33:57 +0000 (08:33 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the December 7 2016 database.
Karsten Loesing [Fri, 9 Dec 2016 09:23:36 +0000 (10:23 +0100)] 
Update geoip and geoip6 to the December 7 2016 database.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Mon, 7 Nov 2016 14:30:42 +0000 (09:30 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 7 Nov 2016 14:30:16 +0000 (09:30 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 7 Nov 2016 14:29:54 +0000 (09:29 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the November 3 2016 database.
Karsten Loesing [Mon, 7 Nov 2016 14:05:19 +0000 (15:05 +0100)] 
Update geoip and geoip6 to the November 3 2016 database.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Thu, 6 Oct 2016 13:59:18 +0000 (09:59 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 6 Oct 2016 13:59:03 +0000 (09:59 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 6 Oct 2016 13:58:54 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the October 6 2016 database.
Karsten Loesing [Wed, 5 Oct 2016 14:35:14 +0000 (16:35 +0200)] 
Update geoip and geoip6 to the October 6 2016 database.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Wed, 7 Sep 2016 17:54:03 +0000 (13:54 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 7 Sep 2016 17:53:53 +0000 (13:53 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 7 Sep 2016 17:53:43 +0000 (13:53 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the September 6 2016 database.
Karsten Loesing [Wed, 7 Sep 2016 09:08:04 +0000 (11:08 +0200)] 
Update geoip and geoip6 to the September 6 2016 database.

8 years agoChanges file for bifroest
Nick Mathewson [Wed, 24 Aug 2016 14:02:42 +0000 (10:02 -0400)] 
Changes file  for bifroest

8 years agoReplace Tonga with Bifroest.
Isis Lovecruft [Tue, 23 Aug 2016 14:39:40 +0000 (14:39 +0000)] 
Replace Tonga with Bifroest.

 * FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Fri, 12 Aug 2016 14:27:08 +0000 (10:27 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Fri, 12 Aug 2016 14:27:01 +0000 (10:27 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 12 Aug 2016 14:26:48 +0000 (10:26 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years agoUpdate geoip and geoip6 to the August 2 2016 database.
Karsten Loesing [Fri, 12 Aug 2016 09:53:38 +0000 (11:53 +0200)] 
Update geoip and geoip6 to the August 2 2016 database.

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 19 Jul 2016 10:32:14 +0000 (12:32 +0200)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 19 Jul 2016 10:31:54 +0000 (12:31 +0200)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 19 Jul 2016 10:31:20 +0000 (12:31 +0200)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years agoUpdate geoip and geoip6 to the July 6 2016 database.
Karsten Loesing [Mon, 18 Jul 2016 06:39:23 +0000 (08:39 +0200)] 
Update geoip and geoip6 to the July 6 2016 database.

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 5 Jul 2016 17:52:04 +0000 (13:52 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 5 Jul 2016 17:51:51 +0000 (13:51 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 5 Jul 2016 17:51:34 +0000 (13:51 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years agowhoops. changelog file for 19271.
Nick Mathewson [Tue, 5 Jul 2016 17:51:21 +0000 (13:51 -0400)] 
whoops. changelog file for 19271.

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 5 Jul 2016 16:22:47 +0000 (12:22 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 5 Jul 2016 16:21:25 +0000 (12:21 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 5 Jul 2016 16:20:42 +0000 (12:20 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years agoRemove urras as a default trusted directory authority
Sebastian Hahn [Sun, 3 Jul 2016 19:56:39 +0000 (21:56 +0200)] 
Remove urras as a default trusted directory authority

It had been a directory authority since 0.2.1.20.

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Mon, 13 Jun 2016 14:48:56 +0000 (10:48 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 13 Jun 2016 14:48:48 +0000 (10:48 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 13 Jun 2016 14:48:35 +0000 (10:48 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years agoUpdate geoip and geoip6 to the June 7 2016 database.
Karsten Loesing [Sun, 12 Jun 2016 09:35:50 +0000 (11:35 +0200)] 
Update geoip and geoip6 to the June 7 2016 database.

9 years agoUse tor_sscanf, not sscanf, in test_util.c.
Nick Mathewson [Thu, 2 Jun 2016 14:11:29 +0000 (10:11 -0400)] 
Use tor_sscanf, not sscanf, in test_util.c.

Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from
working.

9 years agoFix a dangling pointer issue in our RSA keygen code
Nick Mathewson [Fri, 20 May 2016 17:58:52 +0000 (13:58 -0400)] 
Fix a dangling pointer issue in our RSA keygen code

If OpenSSL fails to generate an RSA key, do not retain a dangling
pointer to the previous (uninitialized) key value. The impact here
should be limited to a difficult-to-trigger crash, if OpenSSL is
running an engine that makes key generation failures possible, or if
OpenSSL runs out of memory. Fixes bug 19152; bugfix on
0.2.1.10-alpha. Found by Yuan Jochen Kang, Suman Jana, and Baishakhi
Ray.

This is potentially scary stuff, so let me walk through my analysis.
I think this is a bug, and a backport candidate, but not remotely
triggerable in any useful way.

Observation 1a:

Looking over the OpenSSL code here, the only way we can really fail in
the non-engine case is if malloc() fails.  But if malloc() is failing,
then tor_malloc() calls should be tor_asserting -- the only way that an
attacker could do an exploit here would be to figure out some way to
make malloc() fail when openssl does it, but work whenever Tor does it.

(Also ordinary malloc() doesn't fail on platforms like Linux that
overcommit.)

Observation 1b:

Although engines are _allowed_ to fail in extra ways, I can't find much
evidence online  that they actually _do_ fail in practice. More evidence
would be nice, though.

Observation 2:

We don't call crypto_pk_generate*() all that often, and we don't do it
in response to external inputs. The only way to get it to happen
remotely would be by causing a hidden service to build new introduction
points.

Observation 3a:

So, let's assume that both of the above observations are wrong, and the
attacker can make us generate a crypto_pk_env_t with a dangling pointer
in its 'key' field, and not immediately crash.

This dangling pointer will point to what used to be an RSA structure,
with the fields all set to NULL.  Actually using this RSA structure,
before the memory is reused for anything else, will cause a crash.

In nearly every function where we call crypto_pk_generate*(), we quickly
use the RSA key pointer -- either to sign something, or to encode the
key, or to free the key.  The only exception is when we generate an
intro key in rend_consider_services_intro_points().  In that case, we
don't actually use the key until the intro circuit is opened -- at which
point we encode it, and use it to sign an introduction request.

So in order to exploit this bug to do anything besides crash Tor, the
attacker needs to make sure that by the time the introduction circuit
completes, either:
  * the e, d, and n BNs look valid, and at least one of the other BNs is
    still NULL.
OR
  * all 8 of the BNs must look valid.

To look like a valid BN, *they* all need to have their 'top' index plus
their 'd' pointer indicate an addressable region in memory.

So actually getting useful data of of this, rather than a crash, is
going to be pretty damn hard.  You'd have to force an introduction point
to be created (or wait for one to be created), and force that particular
crypto_pk_generate*() to fail, and then arrange for the memory that the
RSA points to to in turn point to 3...8 valid BNs, all by the time the
introduction circuit completes.

Naturally, the signature won't check as valid [*], so the intro point
will reject the ESTABLISH_INTRO cell.  So you need to _be_ the
introduction point, or you don't actually see this information.

[*] Okay, so if you could somehow make the 'rsa' pointer point to a
different valid RSA key, then you'd get a valid signature of an
ESTABLISH_INTRO cell using a key that was supposed to be used for
something else ... but nothing else looks like that, so you can't use
that signature elsewhere.

Observation 3b:

Your best bet as an attacker would be to make the dangling RSA pointer
actually contain a fake method, with a fake RSA_private_encrypt
function that actually pointed to code you wanted to execute.  You'd
still need to transit 3 or 4 pointers deep though in order to make that
work.

Conclusion:

By 1, you probably can't trigger this without Tor crashing from OOM.

By 2, you probably can't trigger this reliably.

By 3, even if I'm wrong about 1 and 2, you have to jump through a pretty
big array of hoops in order to get any kind of data leak or code
execution.

So I'm calling it a bug, but not a security hole. Still worth
patching.