Nick Mathewson
c0aa7ac5ac
Merge branch 'disable_memory_sentinels_squashed'
2017-02-27 16:25:25 -05:00
Nick Mathewson
b923c4dc9f
Code to disable memory sentinels for fuzzing
...
This feature makes it possible to turn off memory sentinels (like
those used for safety in buffers.c and memarea.c) when fuzzing, so
that we can catch bugs that they would otherwise prevent.
2017-02-27 16:25:10 -05:00
Nick Mathewson
4808540d5c
Merge branch 'maint-0.3.0'
2017-02-27 11:36:56 -05:00
Nick Mathewson
eef8bd4d3c
Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0
2017-02-27 11:36:39 -05:00
Nick Mathewson
b6a9be0415
Merge branch 'maint-0.3.0'
2017-02-27 11:25:46 -05:00
Nick Mathewson
c51919b0da
Merge branch 'bug21369_check_029_squashed' into maint-0.3.0
2017-02-27 11:25:34 -05:00
Nick Mathewson
90283f0db3
Merge branch 'maint-0.3.0'
2017-02-27 11:23:02 -05:00
Nick Mathewson
6747c62386
Merge branch 'bug21420_029_squashed' into maint-0.3.0
2017-02-27 11:20:39 -05:00
Nick Mathewson
f6e5a658df
Revise the logic for picking the start time for link certs
...
Since 0.2.4.11-alpha (in 0196647970
) we've tried to randomize
the start time to up to some time in the past. But unfortunately we
allowed the start time to be in the future as well, which isn't
really legit.
The new behavior lets the start time be be up to
MAX(cert_lifetime-2days, 0) in the past, but never in the future.
Fixes bug 21420; bugfix on 0.2.4.11-alpha.
2017-02-27 11:19:54 -05:00
Nick Mathewson
1421f75331
Merge branch 'maint-0.3.0'
2017-02-27 11:03:25 -05:00
Nick Mathewson
2b3518b81f
Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0
2017-02-27 11:00:02 -05:00
teor
73879aa5b6
Use bash in src/test/test-network.sh
...
This ensures we reliably call chutney's newer tools/test-network.sh when
available.
Fixes bug 21562; bugfix on tor-0.2.9.1-alpha.
2017-02-28 02:13:56 +11:00
teor
fb32c52232
Log tor warnings during 'make test-network-all'
...
Requires the chutney changes from 21572.
(Otherwise, asks users to upgrade their chutney.)
Implements 21570.
2017-02-28 02:01:37 +11:00
Nick Mathewson
ee5471f9aa
Try to check for (and prevent) buffer size INT_MAX overflow better.
...
Possible fix or diagnostic for 21369.
2017-02-27 10:01:27 -05:00
Nick Mathewson
17fa498874
Merge branch 'maint-0.3.0'
2017-02-27 08:38:52 -05:00
Nick Mathewson
b6efd77ec4
Merge remote-tracking branch 'public/bug21472_030' into maint-0.3.0
2017-02-27 08:38:14 -05:00
Nick Mathewson
d73755e36e
Merge branch 'maint-0.3.0'
2017-02-24 11:37:04 -05:00
David Goulet
4ed10e5053
hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cell
...
When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() on a
pointer instead of using the real size of the destination buffer leading to an
overflow passing an enormous value to the signing digest function.
Fortunately, that value was only used to make sure the destination buffer
length was big enough for the key size and in this case it always was because
of the overflow.
Fixes #21553
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-02-24 11:36:36 -05:00
Nick Mathewson
4d3310932a
Small fixes to fuzzing documentation.
2017-02-24 10:57:58 -05:00
Nick Mathewson
efa5bbaba0
Merge branch 'maint-0.3.0'
2017-02-17 11:47:49 -05:00
Nick Mathewson
823fb68a14
Remove a redundant check in ..transition_affects_guards()
...
scan-build found that we we checking UseEntryGuards twice.
Fixes bug 21492.
2017-02-17 11:47:25 -05:00
Nick Mathewson
31be66ea5a
Merge remote-tracking branch 'meejah/ticket-21329-onions-current'
2017-02-16 09:40:56 -05:00
David Goulet
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
Nick Mathewson
39af9fc2b7
Merge branch 'bug21447'
2017-02-15 08:08:25 -05:00
Nick Mathewson
62f98ad485
Merge branch 'maint-0.2.9'
2017-02-15 07:58:15 -05:00
Nick Mathewson
cb6b3b7cad
Limit version numbers to 0...INT32_MAX.
...
Closes 21450; patch from teor.
2017-02-15 07:57:34 -05:00
Nick Mathewson
76d79d597a
Merge branch 'maint-0.2.9'
2017-02-15 07:48:42 -05:00
Nick Mathewson
5d88267bf4
Merge branch 'bug21278_extra_029' into maint-0.2.9
2017-02-15 07:48:30 -05:00
Nick Mathewson
ec6b5a098d
Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9
2017-02-15 07:48:18 -05:00
Nick Mathewson
eeb743588a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-15 07:48:10 -05:00
Nick Mathewson
1ebdae6171
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-15 07:47:28 -05:00
Nick Mathewson
ed806843dc
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-15 07:47:21 -05:00
Nick Mathewson
3781f24b80
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-15 07:47:12 -05:00
Nick Mathewson
a452b71395
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-15 07:47:04 -05:00
Nick Mathewson
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
Nick Mathewson
dec7dc3d82
Merge remote-tracking branch 'dgoulet/ticket20656_030_01'
2017-02-14 19:15:10 -05:00
Nick Mathewson
7e469c1002
Merge branch 'bug20894_029_v3'
2017-02-14 19:10:20 -05:00
Nick Mathewson
491348cb8c
Rename make fuzz to make test-fuzz-corpora
2017-02-14 18:04:10 -05:00
Nick Mathewson
ff088ea7d7
fixup! Don't atoi off the end of a buffer chunk.
...
Credit AFL in the changes file.
2017-02-14 16:44:58 -05:00
Nick Mathewson
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
Nick Mathewson
9f71fde146
changes file for removing compare-by-subtraction pattern
2017-02-14 16:32:59 -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
David Goulet
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
Nick Mathewson
dca8ae5cfa
Merge remote-tracking branch 'dgoulet/bug21116_030_01'
2017-02-13 15:56:01 -05:00
Roger Dingledine
635c5a8a92
be sure to remember the changes file for #20384
2017-02-13 15:22:36 -05:00
Nick Mathewson
d9827e4729
Merge branch 'maint-0.2.9'
2017-02-13 14:41:43 -05:00
Nick Mathewson
a86f95df5c
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-13 14:38:03 -05:00
Nick Mathewson
9b90d515a9
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-13 14:37:55 -05:00
Nick Mathewson
75fe218b16
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-13 14:37:49 -05:00
Nick Mathewson
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00