]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoStop declining to download microdescs with future published times.
Nick Mathewson [Mon, 6 Mar 2017 20:37:01 +0000 (15:37 -0500)] 
Stop declining to download microdescs with future published times.

This change is the only one necessary to allow future versions of
the microdescriptor consensus to replace every 'published' date with
e.g. 2038-01-01 00:00:00; this will save 50-75% in compressed
microdescriptor diff size, which is quite significant.

This commit is a minimal change for 0.2.9; future series will
reduce the use of the 'published' date even more.

Implements part of ticket 21642; implements part of proposal 275.

8 years agoBump to 0.2.9.10-dev
Nick Mathewson [Wed, 1 Mar 2017 13:18:54 +0000 (08:18 -0500)] 
Bump to 0.2.9.10-dev

8 years agobump version to 0.2.9.10
Nick Mathewson [Tue, 28 Feb 2017 15:38:55 +0000 (10:38 -0500)] 
bump version to 0.2.9.10

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 28 Feb 2017 15:38:31 +0000 (10:38 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

This is an "ours" merge to avoid taking a version bump

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 28 Feb 2017 15:37:25 +0000 (10:37 -0500)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.

8 years agobump version to 0.2.8.13
Nick Mathewson [Tue, 28 Feb 2017 15:34:33 +0000 (10:34 -0500)] 
bump version to 0.2.8.13

8 years agoBump version to 0.2.7.7
Nick Mathewson [Tue, 28 Feb 2017 15:27:20 +0000 (10:27 -0500)] 
Bump version to 0.2.7.7

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Tue, 28 Feb 2017 15:26:45 +0000 (10:26 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

"ours" merge to avoid version bumps

8 years agobump to 0.2.6.11
Nick Mathewson [Tue, 28 Feb 2017 15:26:24 +0000 (10:26 -0500)] 
bump to 0.2.6.11

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

"ours" merge to avoid version bumps

8 years agoBump version to 0.2.5.13
Nick Mathewson [Tue, 28 Feb 2017 15:23:20 +0000 (10:23 -0500)] 
Bump version to 0.2.5.13

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

"ours" merge to avoid bumping version

8 years agoBump to 0.2.4.28
Nick Mathewson [Tue, 28 Feb 2017 15:20:46 +0000 (10:20 -0500)] 
Bump to 0.2.4.28

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Fri, 17 Feb 2017 22:10:47 +0000 (17:10 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoCheck for micro < 0, rather than checking "minor" twice.
Nick Mathewson [Fri, 17 Feb 2017 16:31:39 +0000 (11:31 -0500)] 
Check for micro < 0, rather than checking "minor" twice.

Bug found with clang scan-build.  Fixes bug on f63e06d3dc6757d.
Bug not present in any released Tor.

8 years agowhoops; make 21450 compile
Nick Mathewson [Wed, 15 Feb 2017 13:19:37 +0000 (08:19 -0500)] 
whoops; make 21450 compile

8 years agoLimit version numbers to 0...INT32_MAX.
Nick Mathewson [Wed, 15 Feb 2017 12:57:34 +0000 (07:57 -0500)] 
Limit version numbers to 0...INT32_MAX.

Closes 21450; patch from teor.

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

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

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.8' of git-rw.torproject.org:/tor into maint-0.2.8
Nick Mathewson [Wed, 15 Feb 2017 12:51:57 +0000 (07:51 -0500)] 
Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8

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 'bug21278_extra_029' into maint-0.2.9
Nick Mathewson [Wed, 15 Feb 2017 12:48:30 +0000 (07:48 -0500)] 
Merge branch 'bug21278_extra_029' into maint-0.2.9

8 years agoMerge branch 'bug21278_redux_029_squashed' into maint-0.2.9
Nick Mathewson [Wed, 15 Feb 2017 12:48:18 +0000 (07:48 -0500)] 
Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 15 Feb 2017 12:48:10 +0000 (07:48 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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 agogive tor_version_parse_platform some function documentation
Roger Dingledine [Tue, 14 Feb 2017 08:52:01 +0000 (03:52 -0500)] 
give tor_version_parse_platform some function documentation

8 years agoWhen examining descriptors as a dirserver, reject ones with bad versions
Nick Mathewson [Mon, 13 Feb 2017 16:18:04 +0000 (11:18 -0500)] 
When examining descriptors as a dirserver, reject ones with bad versions

This is an extra fix for bug 21278: it ensures that these
descriptors and platforms will never be listed in a legit consensus.

8 years agoExtract the part of tor_version_as_new_as that extracts platform
Nick Mathewson [Mon, 13 Feb 2017 16:17:16 +0000 (11:17 -0500)] 
Extract the part of tor_version_as_new_as that extracts platform

Also add a "strict" mode to reject negative inputs.

8 years agochanges file for removing compare-by-subtraction pattern
Nick Mathewson [Tue, 14 Feb 2017 21:32:59 +0000 (16:32 -0500)] 
changes file for removing compare-by-subtraction pattern

8 years agoPrevent int underflow in dirvote.c compare_vote_rs_.
Nick Mathewson [Mon, 13 Feb 2017 19:07:35 +0000 (14:07 -0500)] 
Prevent int underflow in dirvote.c compare_vote_rs_.

This should be "impossible" without making a SHA1 collision, but
let's not keep the assumption that SHA1 collisions are super-hard.

This prevents another case related to 21278.  There should be no
behavioral change unless -ftrapv is on.

8 years agoFix policies.c instance of the "if (r=(a-b)) return r" pattern
Nick Mathewson [Mon, 13 Feb 2017 18:53:30 +0000 (13:53 -0500)] 
Fix policies.c instance of the "if (r=(a-b)) return r" pattern

I think this one probably can't underflow, since the input ranges
are small.  But let's not tempt fate.

This patch also replaces the "cmp" functions here with just "eq"
functions, since nothing actually checked for anything besides 0 and
nonzero.

Related to 21278.

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.8' into maint-0.2.9
Roger Dingledine [Mon, 13 Feb 2017 20:41:20 +0000 (15:41 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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.8' into maint-0.2.9
Nick Mathewson [Mon, 13 Feb 2017 19:38:03 +0000 (14:38 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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.8' into maint-0.2.9
Nick Mathewson [Tue, 7 Feb 2017 15:39:23 +0000 (10:39 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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.6' into maint-0.2.7-redux
Nick Mathewson [Tue, 7 Feb 2017 15:38:05 +0000 (10:38 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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 agoRevert "Revert "Add hidserv-stats filname to our sandbox filter""
Nick Mathewson [Tue, 7 Feb 2017 15:13:20 +0000 (10:13 -0500)] 
Revert "Revert "Add hidserv-stats filname to our sandbox filter""

This reverts commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661.

The underlying revert was done in 0.2.6, since we aren't backporting
seccomp2 loosening fixes to 0.2.6.  But the fix (for 17354) already
went out in 0.2.7.4-rc, so we shouldn't revert it in 0.2.7.

8 years agoBump the version to 0.2.7.6-dev again
Nick Mathewson [Tue, 7 Feb 2017 14:59:54 +0000 (09:59 -0500)] 
Bump the version to 0.2.7.6-dev again

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

maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch.  I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.

This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.

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.8' into maint-0.2.9
Nick Mathewson [Tue, 7 Feb 2017 14:30:19 +0000 (09:30 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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 agochanges file for 21280
Nick Mathewson [Wed, 25 Jan 2017 18:15:37 +0000 (13:15 -0500)] 
changes file for 21280

8 years agoDo not truncate too long hostnames
junglefowl [Tue, 24 Jan 2017 18:40:01 +0000 (18:40 +0000)] 
Do not truncate too long hostnames

If a hostname is supplied to tor-resolve which is too long, it will be
silently truncated, resulting in a different hostname lookup:

$ tor-resolve $(python -c 'print("google.com" + "m" * 256)')

If tor-resolve uses SOCKS5, the length is stored in an unsigned char,
which overflows in this case and leads to the hostname "google.com".
As this one is a valid hostname, it returns an address instead of giving
an error due to the invalid supplied hostname.

8 years agoMerge branch 'teor_bug21357-v2_029' into maint-0.2.9
Nick Mathewson [Tue, 7 Feb 2017 14:24:08 +0000 (09:24 -0500)] 
Merge branch 'teor_bug21357-v2_029' into maint-0.2.9

8 years agoMerge branch 'bug21108_029' into maint-0.2.9
Nick Mathewson [Tue, 7 Feb 2017 14:22:31 +0000 (09:22 -0500)] 
Merge branch 'bug21108_029' into maint-0.2.9

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

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

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.8' into maint-0.2.9
Nick Mathewson [Tue, 7 Feb 2017 13:55:35 +0000 (08:55 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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.8' into maint-0.2.9
Nick Mathewson [Tue, 7 Feb 2017 13:39:39 +0000 (08:39 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

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

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 agoRework 21359 changes file slightly.
Nick Mathewson [Wed, 1 Feb 2017 15:39:48 +0000 (10:39 -0500)] 
Rework 21359 changes file slightly.

8 years agoSupport LibreSSL with opaque structures
rubiate [Wed, 1 Feb 2017 11:10:46 +0000 (00:10 +1300)] 
Support LibreSSL with opaque structures

Determining if OpenSSL structures are opaque now uses an autoconf check
instead of comparing the version number. Some definitions have been
moved to their own check as assumptions which were true for OpenSSL
with opaque structures did not hold for LibreSSL. Closes ticket 21359.

8 years agoChanges file for 21357: Stop rejecting all IPv6 traffic on some Exits
teor [Wed, 1 Feb 2017 05:39:21 +0000 (16:39 +1100)] 
Changes file for 21357: Stop rejecting all IPv6 traffic on some Exits

This issue was triggered by 17027 in 0.2.8.1-alpha, which rejects a relay's
own IPv6 address.

Bugfix on commit 004f3f4e53 in 0.2.4.7-alpha.