31be66ea5a
Merge remote-tracking branch 'meejah/ticket-21329-onions-current'
2017-02-16 09:40:56 -05:00
832d4636f5
Bump master to 0.3.1.0-alpha-dev
2017-02-15 14:36:56 -05:00
3336f26e60
hs: Avoid a strlen(NULL) if descriptor is not found in cache
...
Instead of returning 404 error code, this led to a NULL pointer being used and
thus a crash of tor.
Fixes #21471
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-02-15 10:27:41 -05:00
d633c4757c
Merge branch 'maint-0.2.9'
2017-02-15 08:19:51 -05:00
fea93abecd
whoops; make 21450 compile
2017-02-15 08:19:37 -05:00
39af9fc2b7
Merge branch 'bug21447'
2017-02-15 08:08:25 -05:00
62f98ad485
Merge branch 'maint-0.2.9'
2017-02-15 07:58:15 -05:00
cb6b3b7cad
Limit version numbers to 0...INT32_MAX.
...
Closes 21450; patch from teor.
2017-02-15 07:57:34 -05:00
76d79d597a
Merge branch 'maint-0.2.9'
2017-02-15 07:48:42 -05:00
5d88267bf4
Merge branch 'bug21278_extra_029' into maint-0.2.9
2017-02-15 07:48:30 -05:00
ec6b5a098d
Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9
2017-02-15 07:48:18 -05:00
eeb743588a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-15 07:48:10 -05:00
1ebdae6171
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-15 07:47:28 -05:00
ed806843dc
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-15 07:47:21 -05:00
3781f24b80
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-15 07:47:12 -05:00
a452b71395
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-15 07:47:04 -05:00
3c4da8a130
give tor_version_parse_platform some function documentation
2017-02-15 07:46:34 -05:00
02e05bd74d
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.
2017-02-15 07:46:34 -05:00
f63e06d3dc
Extract the part of tor_version_as_new_as that extracts platform
...
Also add a "strict" mode to reject negative inputs.
2017-02-15 07:46:34 -05:00
dec7dc3d82
Merge remote-tracking branch 'dgoulet/ticket20656_030_01'
2017-02-14 19:15:10 -05:00
7e469c1002
Merge branch 'bug20894_029_v3'
2017-02-14 19:10:20 -05:00
491348cb8c
Rename make fuzz to make test-fuzz-corpora
2017-02-14 18:04:10 -05:00
4c1ecd7583
fixup! Don't atoi off the end of a buffer chunk.
...
Use STATIC.
2017-02-14 16:45:18 -05:00
c4f2faf301
Don't atoi off the end of a buffer chunk.
...
Fixes bug 20894; bugfix on 0.2.0.16-alpha.
We already applied a workaround for this as 20834, so no need to
freak out (unless you didn't apply 20384 yet).
2017-02-14 16:38:47 -05:00
a0ef3cf088
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.
2017-02-14 16:31:23 -05:00
1afc2ed956
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.
2017-02-14 16:31:11 -05:00
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
3f005c0433
protover: Add new version for prop224 for HSIntro/HSDir
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-02-14 10:51:18 -05:00
dca8ae5cfa
Merge remote-tracking branch 'dgoulet/bug21116_030_01'
2017-02-13 15:56:01 -05:00
d9827e4729
Merge branch 'maint-0.2.9'
2017-02-13 14:41:43 -05:00
a86f95df5c
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 14:38:03 -05:00
9b90d515a9
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-13 14:37:55 -05:00
75fe218b16
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 14:37:49 -05:00
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 14:37:01 -05:00
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
2017-02-12 15:56:31 +01:00
2670844b2b
whoops, removed a semicolon :(
2017-02-09 10:59:48 -05:00
f594bdb3ad
One more prop271 XXX.
2017-02-09 10:52:47 -05:00
14c2a1f403
Update some more XXXXprop271 comments to refer to actual tickets or to be up-to-date
2017-02-09 10:48:28 -05:00
3919f4f529
Remove an XXXprop271 comment: turns out we didn't need a tristate
2017-02-09 10:30:20 -05:00
d15273e9f5
Change "prop271" in XXXXs about guard Ed identity to refer to #20872 .
2017-02-09 10:29:02 -05:00
fe76741021
Remove a suggestion in an XXX271 comment; it is now 21424.
2017-02-09 10:25:32 -05:00
41f880c396
Remove an XXXprop271 comment that has been replaced by #21423
2017-02-09 10:13:54 -05:00
875e5ee3f7
Revise an XXXprop271 comment -- it has been superseded by #21422
2017-02-09 10:11:44 -05:00
58208457a6
Remove an XXXprop271 comment -- it has been replaced by #21421
2017-02-09 10:07:56 -05:00
f263cf954a
Remove a redundant XXX271 comment
2017-02-09 09:57:39 -05:00
e129393e40
test: Add missing socket errno in test_util.c
...
According to 21116, it seems to be needed for Wheezy Raspbian build. Also,
manpage of socket(2) does confirm that this errno value should be catched as
well in case of no support from the OS of IPv4 or/and IPv6.
Fixes #21116
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-02-08 09:00:48 -05:00
4bce2072ac
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-07 10:39:03 -05:00
f2a30413a3
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-07 10:37:53 -05:00
2ce4330249
Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5
2017-02-07 10:37:43 -05:00
Nick Mathewson
David Goulet
Roger Dingledine
Karsten Loesing