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
bee3a46c97
Merge branch 'maint-0.2.8' into release-0.2.8
2017-02-07 08:56:47 -05:00
Nick Mathewson
93ea18e918
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-07 08:55:28 -05:00
Nick Mathewson
115cefdeee
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-07 08:55:07 -05:00
Nick Mathewson
e6965f78b8
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 08:54:54 -05:00
Nick Mathewson
6b37512dc7
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:54:47 -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
c02646b8f0
Merge branch 'maint-0.2.8' into release-0.2.8
2017-02-07 08:41:41 -05:00
Nick Mathewson
7b24f3e0fe
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-07 08:39:33 -05:00
Nick Mathewson
eb72365554
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-07 08:39:25 -05:00
Nick Mathewson
8936c50d83
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 08:39:07 -05:00
Nick Mathewson
05ec055c41
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:38:59 -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
da0d5ad983
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 08:34:37 -05:00
Nick Mathewson
332543baed
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:34:08 -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
2017-02-07 08:33:39 -05:00
Nick Mathewson
640b402232
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-07 08:32:10 -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
0691feda26
Merge branch 'maint-0.2.8' into release-0.2.8
2017-01-11 09:13:24 -05:00
Nick Mathewson
c77ace69bb
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-01-11 09:13:15 -05:00
Nick Mathewson
8c91cbb6ca
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-01-11 09:12:51 -05:00
Nick Mathewson
54771bcaba
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-01-11 09:12:21 -05:00
Nick Mathewson
34fdd510ef
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-01-11 09:11:58 -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
17f20c7b3f
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-20 18:23:49 -05:00
Nick Mathewson
cb2e2056b5
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-12-20 18:23:35 -05:00
Nick Mathewson
2673b4b7a8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-20 18:23:19 -05:00
Nick Mathewson
b6227edae1
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).
2016-12-20 18:22:53 -05:00
Nick Mathewson
746c51b613
Merge branch 'maint-0.2.5' into maint-0.2.6
...
("ours" merge because there is a separate 20384 patch for 026)
2016-12-20 18:22:27 -05:00
Nick Mathewson
39ef343523
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:20:01 -05:00
Nick Mathewson
7d3d56e59a
Merge branch 'maint-0.2.4' into maint-0.2.5
...
(ours merge -- there is a separate 0.2.5 patch for 20384.)
2016-12-20 18:19:41 -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
5d63ceb25c
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-20 18:15:45 -05:00
Nick Mathewson
7f55aaf281
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-12-20 18:15:26 -05:00
Nick Mathewson
a9c8a5ff18
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-12-20 18:14:21 -05:00
Nick Mathewson
b18bde23cf
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-12-20 18:11:25 -05:00
Nick Mathewson
db58d4d16f
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-12-20 18:11:08 -05:00
Nick Mathewson
c59e04b511
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-19 10:12:17 -05:00
Nick Mathewson
f62c74cc72
Bump to 0.2.8.12-dev
2016-12-19 10:12:11 -05:00
Nick Mathewson
9b3b49f83e
Remove a blank line
2016-12-19 08:27:26 -05:00
Nick Mathewson
9b024fb281
0.2.8.12 releasenotes
2016-12-19 08:26:15 -05:00
Nick Mathewson
fe7a0c34b0
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-19 08:07:37 -05:00
Nick Mathewson
b838e1f927
Bump to 0.2.8.12
2016-12-19 08:07:30 -05:00
Nick Mathewson
5d68e5b8fc
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-19 08:01:27 -05:00
Nick Mathewson
592cc50ed4
start an 0.2.8.12 blurb
2016-12-19 08:01:22 -05:00
Nick Mathewson
c11de4c45f
Merge branch 'bug21018_024' into maint-0.2.8
2016-12-19 07:58:21 -05:00
Nick Mathewson
6a00e703a2
Merge branch 'maint-0.2.8' into release-0.2.8
2016-12-19 07:30:30 -05:00
Nick Mathewson
e0306320b5
Merge remote-tracking branch 'teor/new-fallbacks-028-20161219' into maint-0.2.8
2016-12-19 07:27:39 -05:00
teor
4181e812c7
Update the fallback directory mirror list in December 2016
...
Replace the 81 remaining fallbacks of the 100 originally introduced
in Tor 0.2.8.3-alpha in March 2016, with a list of 177 fallbacks
(123 new, 54 existing, 27 removed) generated in December 2016.
Resolves ticket 20170.
2016-12-19 15:44:20 +11:00
