May 2018 - tor-commits - lists.torproject.org

[torbirdy/master] Add support for Thunderbird 60
by sukhbir＠torproject.org 04 May '18

04 May '18

commit 889b99a440723fc896357d709070017fa6330324 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 4 12:00:05 2018 -0400 Add support for Thunderbird 60 --- install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.rdf b/install.rdf index 86d94b1..615b152 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> <Description about="urn:mozilla:install-manifest"> <em:id>castironthunderbirdclub(a)torproject.org</em:id> - <em:version>0.2.4</em:version> + <em:version>0.2.5</em:version> <em:type>2</em:type> <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL> <em:optionsURL>chrome://castironthunderbirdclub/content/preferences.xul</em:optionsURL> @@ -14,7 +14,7 @@ <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <em:minVersion>52.0</em:minVersion> - <em:maxVersion>59.*</em:maxVersion> + <em:maxVersion>60.0</em:maxVersion> </Description> </em:targetApplication>

1 0

[torbirdy/master] Fix issue in resetting default preferences
by sukhbir＠torproject.org 04 May '18

04 May '18

commit 9058e137fcb3a54bfe58a3b3a2ad6cda149b6855 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 4 11:59:44 2018 -0400 Fix issue in resetting default preferences --- chrome/content/preferences.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 2980857..a5d21d5 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -400,8 +400,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.enigmailKeyserver = document.getElementById('torbirdy-enigmail-keyserver'); pub.enigmailConfirmEmail = document.getElementById('torbirdy-confirm-email'); pub.enigmailProtected = document.getElementById('torbirdy-enigmail-protected'); - // Security. - pub.secureRenegotiation = document.getElementById('torbirdy-renegotiation'); // Make sure the user really wants to change these settings. var warnPrompt = pub.prefs.getBoolPref("extensions.torbirdy.warn"); @@ -577,8 +575,8 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.anonService.selectedIndex = 0; pub.enigmailKeyId.checked = false; pub.enigmailConfirmEmail.checked = false; + pub.enigmailProtected.checked = false; pub.emailWizard.checked = false; - pub.secureRenegotiation.checked = false; pub.imapIdle.checked = false; pub.startupFolder.checked = false; pub.fetchAllMails.checked = false;

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 04 May '18

04 May '18

commit 902495dfb083eef6796e0666d5f956eefbf6fdf7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 4 14:20:20 2018 +0000 Update translations for support-miscellaneous --- ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.json b/ja.json index acaa7e58d..2a601181c 100644 --- a/ja.json +++ b/ja.json @@ -2,7 +2,7 @@ "misc-1": { "id": "#misc-1", "control": "misc-1", - "title": "I have a compelling reason to trace a Tor user. Can you help?", + "title": "我々にはTorユーザーを追跡する説得力のある理由があります。協力しますか？", "description": "<p class=\"mb-3\">There is nothing the Tor developers can do to trace Tor users. The same protections that keep bad people from breaking Tor's anonymity also prevent us from tracking users.</p>" }, "misc-2": {

1 0

[chutney/master] Remove all DownloadSchedule torrc options
by teor＠torproject.org 04 May '18

04 May '18

commit 57dd950901c51afdc6c9907961467d30081ecb5d Author: teor <teor2345(a)gmail.com> Date: Fri May 4 14:04:28 2018 +1000 Remove all DownloadSchedule torrc options Chutney used to set these options to 0, ... Tor's default for these options is 0, ... (Except for ClientBootstrapConsensusAuthorityDownloadSchedule, which chutney doesn't use.) Tor 0.2.9 obsoleted these options by moving to exponential backoff, ignoring every delay in the schedule after the first delay. Tor 0.3.4 has replaced these options with aliases, so chutney warns that they aren't real options any more. Closes #25844. --- torrc_templates/bridgeclient.tmpl | 7 ------- torrc_templates/client.tmpl | 10 ---------- torrc_templates/relay-non-dir.tmpl | 10 ---------- 3 files changed, 27 deletions(-) diff --git a/torrc_templates/bridgeclient.tmpl b/torrc_templates/bridgeclient.tmpl index 4c10c54..b524efd 100644 --- a/torrc_templates/bridgeclient.tmpl +++ b/torrc_templates/bridgeclient.tmpl @@ -7,10 +7,3 @@ UseBridges 1 #UseMicrodescriptors 0 ${bridges} - -# Like TestingClientDownloadSchedule, but for bridge clients -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingBridgeDownloadSchedule 0, 5 diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl index 3aff6cb..aa86c01 100644 --- a/torrc_templates/client.tmpl +++ b/torrc_templates/client.tmpl @@ -1,12 +1,2 @@ ${include:common.i} SocksPort $socksport - -#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't -# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS -# at boostrap time. -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingClientDownloadSchedule 0, 5 -TestingClientConsensusDownloadSchedule 0, 5 diff --git a/torrc_templates/relay-non-dir.tmpl b/torrc_templates/relay-non-dir.tmpl index 560ebdf..848bc38 100644 --- a/torrc_templates/relay-non-dir.tmpl +++ b/torrc_templates/relay-non-dir.tmpl @@ -6,16 +6,6 @@ Address $ip # Must be included before exit-v{4,6}.i ExitRelay 0 -#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't -# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS -# at boostrap time. -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingServerDownloadSchedule 0, 5 -TestingServerConsensusDownloadSchedule 0, 5 - # These options are set here so they apply to IPv4 and IPv6 Exits # # Tell Exits to avoid using DNS: otherwise, chutney will fail if DNS fails

1 0

[tor/master] I should have tested before I pushed.
by nickm＠torproject.org 04 May '18

04 May '18

commit 6f8b961a65eea3ed5962da1a7816ad533256d113 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 20:16:53 2018 -0400 I should have tested before I pushed. --- src/rust/include.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/include.am b/src/rust/include.am index 4bc07b05c..152ac5cc3 100644 --- a/src/rust/include.am +++ b/src/rust/include.am @@ -15,8 +15,8 @@ EXTRA_DIST +=\ src/rust/protover/protover.rs \ src/rust/protover/tests/protover.rs \ src/rust/rand/Cargo.toml \ - src/rust/rand/lib.toml \ - src/rust/rand/rng.toml \ + src/rust/rand/lib.rs \ + src/rust/rand/rng.rs \ src/rust/smartlist/Cargo.toml \ src/rust/smartlist/lib.rs \ src/rust/smartlist/smartlist.rs \

1 0

[stem/master] Add DirectoryAuthority.from_remote()
by atagar＠torproject.org 03 May '18

03 May '18

commit 4dfb17200a902ef7c4f4e075da36c833d850be76 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 3 14:51:31 2018 -0700 Add DirectoryAuthority.from_remote() Recently teor split tor's directory authority information into its own file, simplifying parsing a great deal... https://gitweb.torproject.org/tor.git/plain/src/or/auth_dirs.inc Like fallbacks, adding a DirectoryAuthority.from_remote() function which downloads and parses tor's current authority data. This also makes a 'is Stem's cached dirauth data up to date' test a cinch. ;P While whipping this up I found a handful of additional things I'd like to follow this up with... * Our stem.descriptor.remote module has grown way too large. When I first added directory authorities it was just a small constant. But now with parsing and fallback directories our module's 1707 lines. Way past the point where we should split things up. I'll move dirauths and fallbacks to their own files, with aliases for temporary backward compatability (those aliases will be dropped in Stem 2.0). * This new parser needs unit test coverage. Probably similar to our tests for FallbackDirectory.from_remote(). * We should replace our get_authorities() function with DirectoryAuthority.from_cache() for consistancy with the FallbackDirectory and Manual classes. * Now that dirauths note IPv6 ORPorts we should move that attribute from the FallbackDirectory class up to the common Directory parent. --- stem/descriptor/remote.py | 163 +++++++++++++++++++++++++++++++++++++--- test/integ/descriptor/remote.py | 30 +++++++- test/unit/descriptor/remote.py | 4 +- 3 files changed, 183 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 480297f1..a656e354 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -167,9 +167,15 @@ LZMA_UNAVAILABLE_MSG = 'LZMA compression requires the lzma module (https://docs. MAX_FINGERPRINTS = 96 MAX_MICRODESCRIPTOR_HASHES = 90 -GITWEB_FALLBACK_DIR_URL = 'https://gitweb.torproject.org/tor.git/plain/src/or/fallback_dirs.inc' +GITWEB_AUTHORITY_URL = 'https://gitweb.torproject.org/tor.git/plain/src/or/auth_dirs.inc' +GITWEB_FALLBACK_URL = 'https://gitweb.torproject.org/tor.git/plain/src/or/fallback_dirs.inc' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'fallback_directories.cfg') +AUTHORITY_NAME = re.compile('"(\S+) orport=(\d+) .*"') +AUTHORITY_V3IDENT = re.compile('"v3ident=([\dA-F]{40}) "') +AUTHORITY_IPV6 = re.compile('"ipv6=\[([\da-f:]+)\]:(\d+) "') +AUTHORITY_ADDR = re.compile('"([\d\.]+):(\d+) ([\dA-F ]{49})",') + FALLBACK_DIV = '/* ===== */' FALLBACK_MAPPING = re.compile('/\*\s+(\S+)=(\S*)\s+\*/') @@ -1088,6 +1094,143 @@ class DirectoryAuthority(Directory): self.v3ident = v3ident self.is_bandwidth_authority = is_bandwidth_authority + @staticmethod + def from_remote(timeout = 60): + """ + Reads and parses tor's latest directory authority data `from + gitweb.torproject.org + <https://gitweb.torproject.org/tor.git/plain/src/or/auth_dirs.inc>`_. + Note that while convenient, this reliance on GitWeb means you should alway + call with a fallback, such as... + + :: + + try: + fallback_directories = DirectoryAuthority.from_remote() + except IOError: + fallback_directories = get_authorities() + + Authorities provided through this method will not have a + **is_bandwidth_authority** value set. + + .. versionadded:: 1.7.0 + + :param int timeout: seconds to wait before timing out the request + + :returns: **dict** of **str** nicknames to their + :class:`~stem.descriptor.remote.DirectoryAuthority` + + :raises: **IOError** if unable to retrieve the directory authorities + """ + + try: + lines = str_tools._to_unicode(urllib.urlopen(GITWEB_AUTHORITY_URL, timeout = timeout).read()).splitlines() + except: + exc = sys.exc_info()[1] + raise IOError("Unable to download tor's directory authorities from %s: %s" % (GITWEB_AUTHORITY_URL, exc)) + + if not lines: + raise IOError('%s did not have any content' % GITWEB_AUTHORITY_URL) + + results = {} + + while lines: + section = DirectoryAuthority._pop_section(lines) + + if section: + try: + authority = DirectoryAuthority._from_str('\n'.join(section)) + results[authority.nickname] = authority + except ValueError as exc: + raise IOError(str(exc)) + + return results + + @staticmethod + def _from_str(content): + """ + Parses authority from its textual representation. For example... + + :: + + "moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", + + :param str content: text to parse + + :returns: :class:`~stem.descriptor.remote.DirectoryAuthority` in the text + + :raises: **ValueError** if content is malformed + """ + + if isinstance(content, bytes): + content = str_tools._to_unicode(content) + + matches = {} + + for line in content.splitlines(): + for matcher in (AUTHORITY_NAME, AUTHORITY_V3IDENT, AUTHORITY_IPV6, AUTHORITY_ADDR): + m = matcher.match(line.strip()) + + if m: + match_groups = m.groups() + matches[matcher] = match_groups if len(match_groups) > 1 else match_groups[0] + + if AUTHORITY_NAME not in matches: + raise ValueError('Unable to parse the name and orport from:\n\n%s' % content) + elif AUTHORITY_ADDR not in matches: + raise ValueError('Unable to parse the address and fingerprint from:\n\n%s' % content) + + nickname, or_port = matches.get(AUTHORITY_NAME) + v3ident = matches.get(AUTHORITY_V3IDENT) + orport_v6 = matches.get(AUTHORITY_IPV6) # TODO: add this to stem's data? + address, dir_port, fingerprint = matches.get(AUTHORITY_ADDR) + + fingerprint = fingerprint.replace(' ', '') + + if not connection.is_valid_ipv4_address(address): + raise ValueError('%s has an invalid IPv4 address: %s' % (nickname, address)) + elif not connection.is_valid_port(or_port): + raise ValueError('%s has an invalid or_port: %s' % (nickname, or_port)) + elif not connection.is_valid_port(dir_port): + raise ValueError('%s has an invalid dir_port: %s' % (nickname, dir_port)) + elif not tor_tools.is_valid_fingerprint(fingerprint): + raise ValueError('%s has an invalid fingerprint: %s' % (nickname, fingerprint)) + elif nickname and not tor_tools.is_valid_nickname(nickname): + raise ValueError('%s has an invalid nickname: %s' % (nickname, nickname)) + elif orport_v6 and not connection.is_valid_ipv6_address(orport_v6[0]): + raise ValueError('%s has an invalid IPv6 address: %s' % (nickname, orport_v6[0])) + elif orport_v6 and not connection.is_valid_port(orport_v6[1]): + raise ValueError('%s has an invalid ORPort for its IPv6 endpoint: %s' % (nickname, orport_v6[1])) + elif v3ident and not tor_tools.is_valid_fingerprint(v3ident): + raise ValueError('%s has an invalid v3ident: %s' % (nickname, v3ident)) + + return DirectoryAuthority( + address = address, + or_port = int(or_port), + dir_port = int(dir_port), + fingerprint = fingerprint, + nickname = nickname, + v3ident = v3ident, + ) + + @staticmethod + def _pop_section(lines): + """ + Provides the next authority entry. + """ + + section_lines = [] + + if lines: + section_lines.append(lines.pop(0)) + + while lines and lines[0].startswith(' '): + section_lines.append(lines.pop(0)) + + return section_lines + def __hash__(self): return _hash_attr(self, 'nickname', 'v3ident', 'is_bandwidth_authority', parent = Directory) @@ -1333,9 +1476,9 @@ class FallbackDirectory(Directory): :: try: - fallback_directories = stem.descriptor.remote.from_remote() + fallback_directories = FallbackDirectory.from_remote() except IOError: - fallback_directories = stem.descriptor.remote.from_cache() + fallback_directories = FallbackDirectory.from_cache() :param int timeout: seconds to wait before timing out the request @@ -1346,15 +1489,15 @@ class FallbackDirectory(Directory): """ try: - lines = str_tools._to_unicode(urllib.urlopen(GITWEB_FALLBACK_DIR_URL, timeout = timeout).read()).splitlines() + lines = str_tools._to_unicode(urllib.urlopen(GITWEB_FALLBACK_URL, timeout = timeout).read()).splitlines() except: exc = sys.exc_info()[1] - raise IOError("Unable to download tor's fallback directories from %s: %s" % (GITWEB_FALLBACK_DIR_URL, exc)) + raise IOError("Unable to download tor's fallback directories from %s: %s" % (GITWEB_FALLBACK_URL, exc)) if not lines: - raise IOError('%s did not have any content' % GITWEB_FALLBACK_DIR_URL) + raise IOError('%s did not have any content' % GITWEB_FALLBACK_URL) elif lines[0] != '/* type=fallback */': - raise IOError('%s does not have a type field indicating it is fallback directory metadata' % GITWEB_FALLBACK_DIR_URL) + raise IOError('%s does not have a type field indicating it is fallback directory metadata' % GITWEB_FALLBACK_URL) # header metadata @@ -1381,7 +1524,7 @@ class FallbackDirectory(Directory): if section: try: - fallback = FallbackDirectory.from_str('\n'.join(section)) + fallback = FallbackDirectory._from_str('\n'.join(section)) fallback.header = header results[fallback.fingerprint] = fallback except ValueError as exc: @@ -1390,7 +1533,7 @@ class FallbackDirectory(Directory): return results @staticmethod - def from_str(content): + def _from_str(content): """ Parses a fallback from its textual representation. For example... @@ -1401,8 +1544,6 @@ class FallbackDirectory(Directory): /* nickname=rueckgrat */ /* extrainfo=1 */ - .. versionadded:: 1.7.0 - :param str content: text to parse :returns: :class:`~stem.descriptor.remote.FallbackDirectory` in the text diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index f56e1b02..b3553598 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -247,7 +247,35 @@ class TestDescriptorDownloader(unittest.TestCase): self.assertEqual(2, len(list(multiple_query))) @test.require.online - def test_that_cache_is_up_to_date(self): + def test_authority_cache_is_up_to_date(self): + """ + Check if the cached authorities bundled with Stem are up to date or not. + """ + + cached_authorities = stem.descriptor.remote.get_authorities() + latest_authorities = stem.descriptor.remote.DirectoryAuthority.from_remote() + + for nickname in cached_authorities: + if nickname not in latest_authorities: + self.fail('%s is no longer a directory authority in tor' % nickname) + + for nickname in latest_authorities: + if nickname not in cached_authorities: + self.fail('%s is now a directory authority in tor' % nickname) + + # tor doesn't note if an autority is a bwauth or not, so we need to exclude + # that from our comparison + + for attr in ('address', 'or_port', 'dir_port', 'fingerprint', 'nickname', 'v3ident'): + for auth in cached_authorities.values(): + cached_value = getattr(auth, attr) + latest_value = getattr(latest_authorities[auth.nickname], attr) + + if cached_value != latest_value: + self.fail('The %s of the %s authority is %s in tor but %s in stem' % (attr, auth.nickname, latest_value, cached_value)) + + @test.require.online + def test_fallback_cache_is_up_to_date(self): """ Check if the cached fallback directories bundled with Stem are up to date or not. diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 753681e0..a02a1171 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -535,7 +535,7 @@ class TestDescriptorDownloader(unittest.TestCase): orport_v6 = ('2a01:4f8:162:51e2::2', 9001), ) - self.assertEqual(expected, stem.descriptor.remote.FallbackDirectory.from_str(FALLBACK_ENTRY)) + self.assertEqual(expected, stem.descriptor.remote.FallbackDirectory._from_str(FALLBACK_ENTRY)) def test_fallback_directories_from_str_malformed(self): test_values = { @@ -548,4 +548,4 @@ class TestDescriptorDownloader(unittest.TestCase): } for entry, expected in test_values.items(): - self.assertRaisesRegexp(ValueError, expected, stem.descriptor.remote.FallbackDirectory.from_str, entry) + self.assertRaisesRegexp(ValueError, expected, stem.descriptor.remote.FallbackDirectory._from_str, entry)

1 0

[tor/master] Use a deterministic PRNG in test_circuit_timeout()
by nickm＠torproject.org 03 May '18

03 May '18

commit 19b53e264527a1506a21e7b563c47500ac304450 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 19:34:21 2018 -0400 Use a deterministic PRNG in test_circuit_timeout() I'd prefer not to do this for randomized tests, but as things stand with this test, it produces nondeterministic test coverage. Closes ticket 25995; bugfix on 0.2.2.2-alpha when this test was introduced. --- changes/ticket25995 | 5 +++++ src/test/test.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/changes/ticket25995 b/changes/ticket25995 new file mode 100644 index 000000000..855020bd3 --- /dev/null +++ b/changes/ticket25995 @@ -0,0 +1,5 @@ + o Minor bugfixes (tests): + - While running the circuit_timeout test, fix the PRNG to a deterministic + AES stream, so that the test coverage from this test will itself be + deterministic. Fixes bug 25995; bugfix on 0.2.2.2-alpha. + diff --git a/src/test/test.c b/src/test/test.c index 2963f169c..3c6e0a45e 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -349,6 +349,18 @@ test_onion_queues(void *arg) tor_free(onionskin); } +static crypto_cipher_t *crypto_rand_aes_cipher = NULL; + +// Mock replacement for crypto_rand: Generates bytes from a provided AES_CTR +// cipher in <b>crypto_rand_aes_cipher</b>. +static void +crypto_rand_deterministic_aes(char *out, size_t n) +{ + tor_assert(crypto_rand_aes_cipher); + memset(out, 0, n); + crypto_cipher_crypt_inplace(crypto_rand_aes_cipher, out, n); +} + static void test_circuit_timeout(void *arg) { @@ -378,6 +390,11 @@ test_circuit_timeout(void *arg) state = or_state_new(); + // Use a deterministic RNG here, or else we'll get nondeterministic + // coverage in some of the circuitstats functions. + MOCK(crypto_rand, crypto_rand_deterministic_aes); + crypto_rand_aes_cipher = crypto_cipher_new("xyzzyplughplover"); + circuitbuild_running_unit_tests(); #define timeout0 (build_time_t)(30*1000.0) initial.Xm = 3000; @@ -512,6 +529,8 @@ test_circuit_timeout(void *arg) circuit_build_times_free_timeouts(&final); or_state_free(state); teardown_periodic_events(); + UNMOCK(crypto_rand); + crypto_cipher_free(crypto_rand_aes_cipher); } /** Test encoding and parsing of rendezvous service descriptors. */

1 0

[tor/master] Merge remote-tracking branch 'github/ticket25995'
by nickm＠torproject.org 03 May '18

03 May '18

commit 08e525c198c52bb57f154e79326a9b123ef55d91 Merge: 80b9a589b 19b53e264 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 16:52:09 2018 -0400 Merge remote-tracking branch 'github/ticket25995' changes/ticket25995 | 5 +++++ src/test/test.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+)

1 0

[tor/master] Remove dead code in networkstatus.c
by nickm＠torproject.org 03 May '18

03 May '18

commit 1a181a476e623cd6c1bc71173bb2d3d769aa1325 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 25 09:35:32 2018 -0400 Remove dead code in networkstatus.c We can't end up in the removed else {} condition since we first validate the flavor we get and then we validate the flavor we parse from the given consensus which means we can only handle the two flavors of the if/elseif conditions. Fixes #25914 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/networkstatus.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index b0db0cecb..d545ac120 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1841,17 +1841,9 @@ networkstatus_set_current_consensus(const char *consensus, current_valid_after = current_md_consensus->valid_after; } } else { - cached_dir_t *cur; - char buf[128]; - tor_snprintf(buf, sizeof(buf), "cached-%s-consensus", flavor); - consensus_fname = get_cachedir_fname(buf); - tor_snprintf(buf, sizeof(buf), "unverified-%s-consensus", flavor); - unverified_fname = get_cachedir_fname(buf); - cur = dirserv_get_consensus(flavor); - if (cur) { - current_digests = &cur->digests; - current_valid_after = cur->published; - } + tor_assert_nonfatal_unreached(); + result = -2; + goto done; } if (current_digests &&

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket25914_034_01'
by nickm＠torproject.org 03 May '18

03 May '18

commit 80b9a589bb351659252faa9793176ada6c9ce914 Merge: 2f269bfaf 1a181a476 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 16:48:03 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket25914_034_01' src/or/networkstatus.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)

1 0