summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2017-02-27Merge branch 'maint-0.3.0'Nick Mathewson
2017-02-27Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0Nick Mathewson
2017-02-27Fix a wide lineNick Mathewson
2017-02-27Fix a "directive within macro arguments" warningNick Mathewson
2017-02-27Merge remote-tracking branch 'ahf/bugs/21206'Nick Mathewson
2017-02-24Merge branch 'maint-0.3.0'Nick Mathewson
2017-02-24Whitespace fix.Nick Mathewson
2017-02-24Merge branch 'maint-0.3.0'Nick Mathewson
2017-02-24hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cellDavid Goulet
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-17Merge branch 'maint-0.3.0'Nick Mathewson
2017-02-17Remove a redundant check in ..transition_affects_guards()Nick Mathewson
scan-build found that we we checking UseEntryGuards twice. Fixes bug 21492.
2017-02-17Merge branch 'maint-0.3.0'Nick Mathewson
2017-02-17Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-02-17Check for micro < 0, rather than checking "minor" twice.Nick Mathewson
Bug found with clang scan-build. Fixes bug on f63e06d3dc6757d. Bug not present in any released Tor.
2017-02-16Save number of sent/received RELAY_DATA cells for directory connections.Alexander Færøy
This patch makes us store the number of sent and received RELAY_DATA cells used for directory connections. We log the numbers after we have received an EOF in connection_dir_client_reached_eof() from the directory server.
2017-02-16Merge remote-tracking branch 'meejah/ticket-21329-onions-current'Nick Mathewson
2017-02-15hs: Avoid a strlen(NULL) if descriptor is not found in cacheDavid Goulet
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-15Merge branch 'maint-0.2.9'Nick Mathewson
2017-02-15whoops; make 21450 compileNick Mathewson
2017-02-15Merge branch 'maint-0.2.9'Nick Mathewson
2017-02-15Limit version numbers to 0...INT32_MAX.Nick Mathewson
Closes 21450; patch from teor.
2017-02-15Merge branch 'maint-0.2.9'Nick Mathewson
2017-02-15Merge branch 'bug21278_extra_029' into maint-0.2.9Nick Mathewson
2017-02-15Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9Nick Mathewson
2017-02-15Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-02-15Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-15Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-15give tor_version_parse_platform some function documentationRoger Dingledine
2017-02-15When examining descriptors as a dirserver, reject ones with bad versionsNick Mathewson
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-15Extract the part of tor_version_as_new_as that extracts platformNick Mathewson
Also add a "strict" mode to reject negative inputs.
2017-02-14Merge remote-tracking branch 'dgoulet/ticket20656_030_01'Nick Mathewson
2017-02-14Merge branch 'bug20894_029_v3'Nick Mathewson
2017-02-14fixup! Don't atoi off the end of a buffer chunk.Nick Mathewson
Use STATIC.
2017-02-14Don't atoi off the end of a buffer chunk.Nick Mathewson
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-14Prevent int underflow in dirvote.c compare_vote_rs_.Nick Mathewson
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-14Fix policies.c instance of the "if (r=(a-b)) return r" patternNick Mathewson
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-14Avoid integer underflow in tor_version_compare.Nick Mathewson
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-14protover: Add new version for prop224 for HSIntro/HSDirDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-02-10Remove unused variable in directory_command_should_use_begindir()Alexander Færøy
This patch removes the unused router_purpose variable in directory_command_should_use_begindir().
2017-02-09Change RELAY_BEGINDIR to RELAY_BEGIN_DIR in comments.Alexander Færøy
This is a purely cosmetic patch that changes RELAY_BEGINDIR in various comments to RELAY_BEGIN_DIR, which should make it easier to grep for the symbols.
2017-02-09whoops, removed a semicolon :(Nick Mathewson
2017-02-09One more prop271 XXX.Nick Mathewson
2017-02-09Update some more XXXXprop271 comments to refer to actual tickets or to be ↵Nick Mathewson
up-to-date
2017-02-09Remove an XXXprop271 comment: turns out we didn't need a tristateNick Mathewson
2017-02-09Change "prop271" in XXXXs about guard Ed identity to refer to #20872.Nick Mathewson
2017-02-09Remove a suggestion in an XXX271 comment; it is now 21424.Nick Mathewson
2017-02-09Remove an XXXprop271 comment that has been replaced by #21423Nick Mathewson
2017-02-09Revise an XXXprop271 comment -- it has been superseded by #21422Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion