torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,145 Commits 53 Branches 631 Tags
1f421d8d47e914bfc826616498c22efbb7289b2e
Commit Graph

17731 Commits

Author SHA1 Message Date
George Kadianakis 1f421d8d47 prop224: Fix the HS descriptor unittests. 
- HS descriptors are now bigger than 10kb.
- encrypted_data_length_is_valid() is not that strict now.
 2017-03-13 15:55:21 +02:00
George Kadianakis d0fe199269 prop224: Implement decoding of superencrypted HS descriptor. 
[Consider starting review from desc_decrypt_all() ]
 2017-03-13 15:55:20 +02:00
George Kadianakis b2e37b87a7 prop224: Implement encoding of superencrypted HS descriptor. 
Also, relaxed the checks of encrypted_data_length_is_valid() since now
only one encrypted section has padding requirements and we don't
actually care to check that all the padding is there.

Consider starting code review from function encode_superencrypted_data().
 2017-03-13 15:55:20 +02:00
George Kadianakis bb602f6197 prop224: Prepare for superencrypted HS descriptors. 
- Refactor our HS desc crypto funcs to be able to differentiate between
  the superencrypted layer and the encrypted layer so that different
  crypto constants and padding is used in each layer.

- Introduce some string constants.

- Add some comments.
 2017-03-13 15:49:14 +02:00
George Kadianakis f8ac4bb9fd prop224: Rename desc->encrypted_blob to desc->superencrypted_blob 2017-02-24 16:37:24 +02:00
George Kadianakis 6d71eda263 prop224: Rename auth_required HS desc field to intro_auth_required. 
And remove "password" type from the list of intro auths.
 2017-02-24 16:37:24 +02: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 9b1d99018b Merge branch 'maint-0.3.0' 2017-02-17 11:33:04 -05:00
Nick Mathewson 5dbbd6bc39 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-02-17 11:32:45 -05:00
Nick Mathewson 67cec7578c Check for micro < 0, rather than checking "minor" twice. 
Bug found with clang scan-build.  Fixes bug on f63e06d3dc.
Bug not present in any released Tor.
 2017-02-17 11:31:39 -05:00
Nick Mathewson d3f0f10efd Fix memleak in test_getinfo_helper_onion. 
Fix on fc58c37e33. Not in any released tor
 2017-02-17 10:08:31 -05:00
Nick Mathewson 31be66ea5a Merge remote-tracking branch 'meejah/ticket-21329-onions-current' 2017-02-16 09:40:56 -05:00
Nick Mathewson 832d4636f5 Bump master to 0.3.1.0-alpha-dev 2017-02-15 14:36: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 d633c4757c Merge branch 'maint-0.2.9' 2017-02-15 08:19:51 -05:00
Nick Mathewson fea93abecd whoops; make 21450 compile 2017-02-15 08:19:37 -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
Roger Dingledine 3c4da8a130 give tor_version_parse_platform some function documentation 2017-02-15 07:46:34 -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 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
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 4c1ecd7583 fixup! Don't atoi off the end of a buffer chunk. 
Use STATIC.
 2017-02-14 16:45:18 -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 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
Nick Mathewson 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
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
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
Nick Mathewson 124062e843 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-13 14:37:01 -05:00
Karsten Loesing f6016058b4 Update geoip and geoip6 to the February 8 2017 database. 2017-02-12 15:56:31 +01:00
Nick Mathewson 2670844b2b whoops, removed a semicolon :( 2017-02-09 10:59:48 -05:00
Nick Mathewson f594bdb3ad One more prop271 XXX. 2017-02-09 10:52:47 -05:00