Commit Graph
17449 Commits
Author SHA1 Message Date
Nick Mathewson cdc960b538 Merge branch 'maint-0.2.4' into release-0.2.4 2017-05-08 08:07:56 -04:00
Karsten Loesing 5207e41ffe Update geoip and geoip6 to the May 2 2017 database. 2017-05-08 10:09:42 +02:00
Nick Mathewson d92e622b41 Merge branch 'maint-0.2.4' into release-0.2.4 2017-04-06 08:32:31 -04:00
Karsten Loesing 9d7933296c Update geoip and geoip6 to the April 4 2017 database. 2017-04-06 10:52:39 +02:00
Nick Mathewson 64bc1490ea Merge branch 'maint-0.2.4' into release-0.2.4 2017-03-08 10:09:20 -05:00
Karsten Loesing 4488c319dd Update geoip and geoip6 to the March 7 2017 database. 2017-03-08 09:41:35 +01:00
Nick Mathewson 16bbbe82e4 Pick a date, update ReleaseNotes. (0.2.4) tor-0.2.4.28 2017-03-03 14:55:06 -05:00
Nick Mathewson 70840ea6d5 Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-28 10:21:58 -05:00
Nick Mathewson 4bab288a82 Bump to 0.2.4.28 2017-02-28 10:20:46 -05:00
Nick Mathewson e9d45f63aa Sort changelog in release-0.2.4 2017-02-28 10:11:31 -05:00
Nick Mathewson d1dc3d0154 Adjust 0.2.4.28 changelog entry from 0.3.0.4-rc to match 2017-02-28 10:06:00 -05:00
Nick Mathewson 5c139d2491 typo fix 2017-02-23 16:48:04 -05:00
Nick Mathewson a84f923e89 Begin an 0.2.4.28 changelog.
To build this changelog, I've gone through the entries in
release-0.2.4's changes subdirectory, and looked up the ChangeLog
entry for each.  I have not sorted them yet.
2017-02-23 11:16:31 -05:00
Nick Mathewson 2e03c02b74 Remove to changes files that already went in 0.2.4.27 2017-02-23 11:04:21 -05:00
Nick Mathewson 3f5eec8dd7 Bump to 0.2.4.27-dev 2017-02-17 16:11:42 -05:00
Nick Mathewson 2afdf8de2f Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-15 07:50:45 -05:00
Nick Mathewson 194e31057f 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.)
2017-02-14 16:10:27 -05:00
Roger Dingledine 635c5a8a92 be sure to remember the changes file for #20384 2017-02-13 15:22:36 -05:00
Nick Mathewson 92f8b56e27 Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-13 14:39:10 -05:00
Karsten Loesing f6016058b4 Update geoip and geoip6 to the February 8 2017 database. 2017-02-12 15:56:31 +01:00
Nick Mathewson 8bcc14f62e Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-07 10:39:48 -05:00
Nick Mathewson 85a2487f97 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix 2017-02-07 09:49:23 -05:00
Nick Mathewson cfeb1db2fb Add comments to connection_check_event(). 2017-02-07 09:48:24 -05:00
Nick Mathewson 457d38a6e9 Change behavior on missing/present event to warn instead of asserting.
Add a changes file.
2017-02-07 09:48:19 -05:00
Nick Mathewson 650c03127a 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.
2017-02-07 09:48:13 -05:00
Nick Mathewson 9c5ff56659 Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-07 09:21:10 -05:00
Nick Mathewson e4a42242ea Backport the tonga->bifroest move to 0.2.4.
This is a backport of 19728 and 19690
2017-02-07 09:15:21 -05:00
Nick Mathewson a2192a671c Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-07 08:56:58 -05:00
Nick Mathewson d6eae78e29 Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4 2017-02-07 08:47:11 -05:00
Nick Mathewson 040d7cecf3 Merge branch 'maint-0.2.4' into release-0.2.4 2017-02-07 08:40:00 -05:00
Nick Mathewson 51675f97d3 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4 2017-02-07 08:37:07 -05:00
Nick Mathewson 6cb8c0fd4e 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);
2017-02-07 08:33:51 -05:00
teor (Tim Wilson-Brown) fb7d1f41b4 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.
2017-02-07 08:33:39 -05:00
John Brooks 053e11f397 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.
2017-02-07 08:31:37 -05:00
Nick Mathewson d7810bb4a3 Merge branch 'maint-0.2.4' into release-0.2.4 2017-01-11 09:11:44 -05:00
Karsten Loesing 3833f67dd2 Update geoip and geoip6 to the January 4 2017 database. 2017-01-04 10:19:52 +01:00
Nick Mathewson 956c61ec23 Merge branch 'maint-0.2.4' into release-0.2.4 2016-12-20 18:19:18 -05:00
Nick Mathewson 8f857c23b7 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.
2016-12-20 18:18:53 -05:00
Nick Mathewson ec3df7cbd2 Merge branch 'maint-0.2.4' into release-0.2.4 2016-12-20 18:05:47 -05:00
Nick Mathewson 0fb3058ece Make log message warn about detected attempts to exploit 21018. 2016-12-18 20:17:28 -05:00
Nick Mathewson d978216dea 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
2016-12-18 20:17:24 -05:00
Nick Mathewson ce12cde92c Merge branch 'maint-0.2.4' into release-0.2.4 2016-12-09 08:34:39 -05:00
Karsten Loesing 9db47e7921 Update geoip and geoip6 to the December 7 2016 database. 2016-12-09 10:23:36 +01:00
Nick Mathewson bd44053716 Merge branch 'maint-0.2.4' into release-0.2.4 2016-11-07 09:29:37 -05:00
Karsten Loesing ea597832e2 Update geoip and geoip6 to the November 3 2016 database. 2016-11-07 15:05:19 +01:00
Karsten Loesing 1b4984f196 Update geoip and geoip6 to the October 6 2016 database. 2016-10-05 16:35:14 +02:00
Karsten Loesing 56f95ba94d Update geoip and geoip6 to the September 6 2016 database. 2016-09-07 11:08:04 +02:00
Karsten Loesing 1410947351 Update geoip and geoip6 to the August 2 2016 database. 2016-08-12 11:53:38 +02:00
Karsten Loesing 79939c6f11 Update geoip and geoip6 to the July 6 2016 database. 2016-07-18 08:40:22 +02:00
Nick Mathewson 0e2f18868c Merge branch 'maint-0.2.4' into release-0.2.4 2016-07-05 13:51:28 -04:00