Nick Mathewson
0087fe36c1
Merge remote-tracking branch 'dgoulet/bug20572_030_01'
2016-12-23 10:03:35 -05:00
Nick Mathewson
fda7f00321
Note memset as redundant; see 20764.
2016-12-23 09:59:41 -05:00
Nick Mathewson
70243affe7
changes file for 19222
2016-12-23 09:53:16 -05:00
Nick Mathewson
cea1a4e19d
This is no longer inline.
2016-12-23 09:50:44 -05:00
Hans Jerry Illikainen
a23fd15786
Fix unreachable heap corruption in base64_decode()
...
Give size_mul_check() external linkage and use it in base64_decode() to
avoid a potential integer wrap.
Closes #19222
2016-12-23 09:47:09 -05:00
Nick Mathewson
f3da62dbdf
changes file for 19899
2016-12-23 08:29:11 -05:00
Nick Mathewson
9fb2bf2f3f
Merge remote-tracking branch 'dgoulet/bug19899_030_01'
2016-12-23 08:28:05 -05:00
Nick Mathewson
2f589e1057
Use event_base_new(), not event_init(), to detect libevent 2.
...
(event_init() is obsoleted in libevent 2.)
Fixes bug 21051; bugfix on 0.2.9.1-alpha when we dropped libevent 1
support.
2016-12-23 08:18:31 -05:00
Nick Mathewson
d528690e90
Merge branch 'maint-0.2.9'
2016-12-23 08:08:23 -05:00
Nick Mathewson
aaeb50b2f3
changes file for 21035.
2016-12-23 08:08:14 -05:00
George Kadianakis
7456677a50
Make outter (plaintext) layer of HS desc conform to prop224.
...
This basically means changing the 'encrypted' field to 'superencrypted'.
2016-12-23 15:07:21 +02:00
Nick Mathewson
a6eaa121e4
Merge branch 'maint-0.2.9'
2016-12-23 08:06:19 -05:00
Nick Mathewson
1d91bf57df
Merge branch 'bug21035' into maint-0.2.9
2016-12-23 08:06:11 -05:00
David Goulet
955d4b7abd
circuit: Change close reasons from uint16_t to int
...
When marking for close a circuit, the reason value, a integer, was assigned to
a uint16_t converting any negative reasons (internal) to the wrong value. On
the HS side, this was causing the client to flag introduction points to be
unreachable as the internal reason was wrongfully converted to a positive
16bit value leading to flag 2 out of 3 intro points to be unreachable.
Fixes #20307 and partially fixes #21056
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-22 12:37:42 -05:00
David Goulet
2d1fa58fb4
test: Add unit test for prune_services_on_reload()
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-21 15:00:19 -05:00
David Goulet
36b5ca2c8b
hs: Move and improve the service pruning code
...
First, this commit moves the code used to prune the service list when
reloading Tor (HUP signal for instance) to a function from
rend_config_services().
Second, fix bug #21054 , improve the code by using the newly added
circuit_get_next_service_intro_circ() function instead of poking at the global
list directly and add _many_ more comments.
Fixes #21054 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-21 15:00:19 -05:00
David Goulet
8a05e1a5d2
circuit: Add a function to get the next service intro circuit
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-12-21 15:00:19 -05:00
Nick Mathewson
a757f76967
Withstand failures in CLOCK_MONOTONIC_COARSE
...
This came up on #21035 , where somebody tried to build on a linux
system with kernel headers including CLOCK_MONOTONIC_COARSE, then
run on a kernel that didn't support it.
I've adopted a belt-and-suspenders approach here: we detect failures
at initialization time, and we also detect (loudly) failures later on.
Fixes bug 21035; bugfix on 0.2.9.1-alpha when we started using
monotonic time.
2016-12-21 08:17:26 -05:00
Nick Mathewson
df87812b41
Merge remote-tracking branch 'teor/fallbacks-20161219'
2016-12-20 18:38:45 -05:00
Nick Mathewson
3341ad1e9b
Merge branch 'maint-0.2.9'
2016-12-20 18:24:09 -05:00
Nick Mathewson
490cd03869
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-20 18:23:54 -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
d4c125b297
Merge branch 'maint-0.2.9'
2016-12-20 18:16:13 -05:00
Nick Mathewson
a9bfa997ae
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-20 18:15:56 -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
teor
a0bbd72caa
Add and update fallback directory details
...
These updates were made after the December 2016 list was created.
2016-12-21 08:15:21 +11:00
Nick Mathewson
9bf89f80ce
bump to 0.3.0.1-alpha-dev
2016-12-19 14:24:38 -05:00
Nick Mathewson
ac04fcd2e7
style edits
2016-12-19 13:39:35 -05:00
Nick Mathewson
6a7cb21e13
Bump to 0.3.0.1-alpha
2016-12-19 13:14:24 -05:00
Nick Mathewson
1c5f2ee7c0
Add checkSpace to dist
2016-12-19 13:03:39 -05:00
Nick Mathewson
2ebf1bd282
pick a date, reflow.
2016-12-19 12:48:40 -05:00
Nick Mathewson
b6a5376b9c
Merge branch 'bug21007'
2016-12-19 12:31:29 -05:00
Nick Mathewson
c468df3961
Don't warn about absent guard state when none expected.
...
Self-testing circuits don't use guards, and nobody uses guards when
UseEntryGuards is disabled.
Fixes bug 21007; bug not in any released Tor.
2016-12-19 12:24:30 -05:00
Nick Mathewson
271bfc92b8
Extraneous . in the changelog
2016-12-19 11:03:03 -05:00
Nick Mathewson
ec1b4c777b
more small changelog edits
2016-12-19 10:45:47 -05:00
Nick Mathewson
f6261a6c40
How embarrassing; I didn't have a changes file for 19877.
2016-12-19 10:35:23 -05:00
Nick Mathewson
ec68ed5afc
Start on an 0.3.0.1-alpha changelog
2016-12-19 10:30:24 -05:00
Nick Mathewson
69c8d6add5
Fix a lint-changes warning
2016-12-19 10:19:22 -05:00
Nick Mathewson
2c8a151323
Remove changes files already merged in 0.2.9.8
2016-12-19 10:17:25 -05:00
Nick Mathewson
e577eb22f7
forward-port releasenotes and changelog
2016-12-19 10:15:29 -05:00
Nick Mathewson
157e6a2932
Merge branch 'maint-0.2.9'
...
"Ours" merge to avoid version bump.
2016-12-19 10:13:29 -05:00
