tor-commits May 2017

tor-commits@lists.torproject.org

16 participants
1135 discussions

[stem/master] Proposal 274 parameters (onion key rotation)
by atagar＠torproject.org 16 May '17

16 May '17

commit 4a5f4cde723cb5cecca76e15b7b39346cff8b34c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 16 10:10:00 2017 -0700 Proposal 274 parameters (onion key rotation) Couple more recently added parameters... https://gitweb.torproject.org/torspec.git/commit/?id=78636a3 --- stem/descriptor/networkstatus.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index a48d838..942c524 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -161,6 +161,8 @@ DEFAULT_PARAMS = { 'usecreatefast': 1, 'max-consensuses-age-to-cache-for-diff': 72, 'try-diff-for-consensus-newer-than': 72, + 'onion-key-rotation-days': 28, + 'onion-key-grace-period-days': 7, } # KeyCertificate fields, tuple is of the form... @@ -210,6 +212,8 @@ PARAM_RANGE = { 'AuthDirNumSRVAgreements': (1, MAX_PARAM), 'max-consensuses-age-to-cache-for-diff': (0, 8192), 'try-diff-for-consensus-newer-than': (0, 8192), + 'onion-key-rotation-days': (1, 90), + 'onion-key-grace-period-days': (1, 90), # max is the highest onion-key-rotation-days } AUTHORITY_HEADER = (

1 0

[stem/master] Proposal 140 parameters (consensus diffs)
by atagar＠torproject.org 16 May '17

16 May '17

commit 1e70f029082ffc00aee4bf05e47665f65b5f7de8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 16 10:00:21 2017 -0700 Proposal 140 parameters (consensus diffs) Just adding the parameters from... https://gitweb.torproject.org/torspec.git/commit/?id=1e48c77 Consensus diffs are a neat addition and we might add it to our remote module at some point, but gonna wait for it to have a use case for python users. --- stem/descriptor/networkstatus.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 1a155cd..a48d838 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -159,6 +159,8 @@ DEFAULT_PARAMS = { 'UseOptimisticData': 1, 'Support022HiddenServices': 1, 'usecreatefast': 1, + 'max-consensuses-age-to-cache-for-diff': 72, + 'try-diff-for-consensus-newer-than': 72, } # KeyCertificate fields, tuple is of the form... @@ -206,6 +208,8 @@ PARAM_RANGE = { 'NumNTorsPerTAP': (1, 100000), 'AllowNonearlyExtend': (0, 1), 'AuthDirNumSRVAgreements': (1, MAX_PARAM), + 'max-consensuses-age-to-cache-for-diff': (0, 8192), + 'try-diff-for-consensus-newer-than': (0, 8192), } AUTHORITY_HEADER = (

1 0

[webwml/master] Add new Tor Browser version: 7.0a4
by boklm＠torproject.org 16 May '17

16 May '17

commit d71249085161e3994f12d4e54fb38e21cdc49ac4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 16 17:33:25 2017 +0200 Add new Tor Browser version: 7.0a4 --- include/versions.wmi | 18 +++++++++--------- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 8994e37..1d35807 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,28 +5,28 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.5</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.5.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a3</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a4</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2017-04-19</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>7.0a3</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-04-20</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>7.0a4</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-05-16</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-04-19</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-04-20</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-04-20</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a4</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-05-16</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a4</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-05-16</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-04-19</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a3</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-04-20</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a4</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-05-16</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.6</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 4399c58..1c6b754 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,9 @@ "7.0a3", "7.0a3-Linux", "7.0a3-MacOS", -"7.0a3-Windows" +"7.0a3-Windows", +"7.0a4", +"7.0a4-Linux", +"7.0a4-MacOS", +"7.0a4-Windows" ]

1 0

[tor/master] Fix resource leak in parse_consensus_request()
by nickm＠torproject.org 16 May '17

16 May '17

commit bbeba2412e58501da4097409258d329ca97edb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 10:47:41 2017 -0400 Fix resource leak in parse_consensus_request() We were allocating diff_hash_in_url on some URLs, but not freeing it. Fixes CID 1409669. Bug not in any released Tor. --- src/or/consdiffmgr.c | 1 + src/or/directory.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index a8df077..2af1047 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -566,6 +566,7 @@ consdiffmgr_find_consensus(struct consensus_cache_entry_t **entry_out, consensus_flavor_t flavor, compress_method_t method) { + tor_assert(entry_out); tor_assert((int)flavor < N_CONSENSUS_FLAVORS); int pos = consensus_compression_method_pos(method); diff --git a/src/or/directory.c b/src/or/directory.c index d954c06..ef74c0f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3929,8 +3929,10 @@ parse_consensus_request(parsed_consensus_request_t *out, uint8_t diff_from[DIGEST256_LEN]; out->diff_from_digests = smartlist_new(); out->diff_only = 1; - if (!parse_one_diff_hash(diff_from, diff_hash_in_url, "URL", - "rejecting")) { + int ok = !parse_one_diff_hash(diff_from, diff_hash_in_url, "URL", + "rejecting"); + tor_free(diff_hash_in_url); + if (ok) { smartlist_add(out->diff_from_digests, tor_memdup(diff_from, DIGEST256_LEN)); } else {

1 0

[tor/master] Report deleted consensuses as NOT_FOUND rather than AVAILABLE
by nickm＠torproject.org 16 May '17

16 May '17

commit 2ca827104db2425bdb7f854c7b20d102706d559a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 10:44:24 2017 -0400 Report deleted consensuses as NOT_FOUND rather than AVAILABLE This bug happened because of a bogus pointer check in consdiffmgr_find_consensus(), not in any released Tor. Fixes CID 1409670. Good catch, Coverity! --- src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 72a4f01..a8df077 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -577,7 +577,7 @@ consdiffmgr_find_consensus(struct consensus_cache_entry_t **entry_out, if (!handle) return CONSDIFF_NOT_FOUND; *entry_out = consensus_cache_entry_handle_get(handle); - if (entry_out) + if (*entry_out) return CONSDIFF_AVAILABLE; else return CONSDIFF_NOT_FOUND;

1 0

[tor/master] Fix remaining (non-false-positive) lintchanges complaints
by nickm＠torproject.org 16 May '17

16 May '17

commit 222534d35414d185bc5c417d7a46569cc7cf7a84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 10:32:00 2017 -0400 Fix remaining (non-false-positive) lintchanges complaints --- changes/bug19699 | 2 +- changes/bug20341 | 2 +- changes/bug20913 | 6 +++--- changes/bug21121 | 2 +- changes/bug21155 | 4 ++-- changes/bug21715 | 2 +- changes/bug22042 | 4 +++- changes/bug22270 | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/changes/bug19699 b/changes/bug19699 index 8bfe662..10ba57f 100644 --- a/changes/bug19699 +++ b/changes/bug19699 @@ -2,4 +2,4 @@ - Make test-network.sh always call chutney's test-network.sh. Previously, this only worked on systems which had bash installed, due to some bash-specific code in the script. - Fixes bug 19699; follow-up to 21581. + Fixes bug 19699; bugfix on 0.3.0.4-rc. Follow-up to ticket 21581. diff --git a/changes/bug20341 b/changes/bug20341 index 399ee50..419240c 100644 --- a/changes/bug20341 +++ b/changes/bug20341 @@ -1,3 +1,3 @@ o Documentation: - Document key=value pluggable transport arguments for Bridge lines in - torrc. Fixes bug 20341; feature first appeared in 0.2.5.1-alpha. + torrc. Fixes bug 20341; bugfix on 0.2.5.1-alpha. diff --git a/changes/bug20913 b/changes/bug20913 index 5086edc..df7f106 100644 --- a/changes/bug20913 +++ b/changes/bug20913 @@ -1,9 +1,9 @@ o Minor bugfixes (fallbacks): - Make sure fallback directory mirrors have the same address, port, and relay identity key for at least 30 days before they are selected. - Fixes 20913, bugfix on 0.2.8.1-alpha. + Fixes bug 20913; bugfix on 0.2.8.1-alpha. - Decrease the guard flag average required to be a fallback. This allows us to keep relays that have their guard flag removed when they restart. - Fixes 20913, bugfix on 0.2.8.1-alpha. + Fixes bug 20913; bugfix on 0.2.8.1-alpha. - Decrease the minimum number of fallbacks to 100. - Fixes 20913, bugfix on 0.2.8.1-alpha. + Fixes bug 20913; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug21121 b/changes/bug21121 index b74332c..96b9730 100644 --- a/changes/bug21121 +++ b/changes/bug21121 @@ -1,3 +1,3 @@ - o Minor enhancements (fallbacks): + o Minor features (fallback directories): - Update the fallback directory mirror whitelist and blacklist based on operator emails. Closes task 21121. diff --git a/changes/bug21155 b/changes/bug21155 index 33c0cd1..67e4a64 100644 --- a/changes/bug21155 +++ b/changes/bug21155 @@ -1,5 +1,5 @@ - o Minor bugfixes (hidden service, logging): + o Minor features (hidden service, logging): - Warn user if multiple entries in EntryNodes and at least one HiddenService are used together. Pinning EntryNodes along with an hidden service can be possibly harmful for instance see ticket 14917 or 21155. - Fixes bug 21155. + Closes ticket 21155. diff --git a/changes/bug21715 b/changes/bug21715 index f8b5ae2..54ad1ad 100644 --- a/changes/bug21715 +++ b/changes/bug21715 @@ -2,4 +2,4 @@ - Default of NumEntryGuards is 1 if the consensus parameter guard-n-primary-guards-to-use isn't set. Default of NumDirectoryGuards is 3 if the consensus parameter guard-n-primary-dir-guards-to-use isn't - set. Fixes bug 21715. + set. Fixes bug 21715; bugfix on 0.3.0.1-alpha. diff --git a/changes/bug22042 b/changes/bug22042 index c1188df..dccf83d 100644 --- a/changes/bug22042 +++ b/changes/bug22042 @@ -2,4 +2,6 @@ - Trigger HS descriptor events on the control port when the client is unable to pick a suitable hidden service directory. This can happen if they are all in the ExcludeNodes list or they all have been queried - inside the allowed 15 minutes. Fixes bug 22042. + inside the allowed 15 minutes. Fixes bug 22042; bugfix on + 0.2.5.2-alpha. + diff --git a/changes/bug22270 b/changes/bug22270 index 9130838..6b58446 100644 --- a/changes/bug22270 +++ b/changes/bug22270 @@ -1,4 +1,4 @@ o Minor bugfixes (fallback directory mirrors): - Make the usage example in updateFallbackDirs.py actually work. (And explain what it does.) - Fixes bug 22270 in 0.3.0.3-alpha. + Fixes bug 22270; bugfix on 0.3.0.3-alpha.

1 0

[metrics-web/master] Update resource pattern for update pings.
by karsten＠torproject.org 16 May '17

16 May '17

commit 00b6475f966162074b7b8f9307c7a3d4e01af13b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 16:30:35 2017 +0200 Update resource pattern for update pings. Issue spotted by Lunar, fix suggested by boklm. --- modules/webstats/src/main/resources/init-webstats.sql | 4 ++-- website/src/main/resources/web/WEB-INF/stats.jsp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/webstats/src/main/resources/init-webstats.sql b/modules/webstats/src/main/resources/init-webstats.sql index 98bb758..5c23176 100644 --- a/modules/webstats/src/main/resources/init-webstats.sql +++ b/modules/webstats/src/main/resources/init-webstats.sql @@ -66,7 +66,7 @@ CREATE OR REPLACE VIEW webstats AS NULL::BOOLEAN AS incremental, SUM(count) AS count FROM files NATURAL JOIN requests NATURAL JOIN resources - WHERE resource_string LIKE '%/torbrowser/update_2/%' + WHERE resource_string LIKE '%/torbrowser/update\__/%' AND resource_string NOT LIKE '%.xml' AND response_code = 200 AND method = 'GET' @@ -122,7 +122,7 @@ CREATE OR REPLACE VIEW webstats AS NULL::BOOLEAN AS incremental, SUM(count) AS count FROM files NATURAL JOIN requests NATURAL JOIN resources - WHERE resource_string LIKE '%/tormessenger/update_2/%' + WHERE resource_string LIKE '%/tormessenger/update\__/%' AND resource_string NOT LIKE '%.xml' AND resource_string NOT LIKE '%/' AND resource_string NOT LIKE '%/?' diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp b/website/src/main/resources/web/WEB-INF/stats.jsp index 8926b16..90b9c3b 100644 --- a/website/src/main/resources/web/WEB-INF/stats.jsp +++ b/website/src/main/resources/web/WEB-INF/stats.jsp @@ -512,10 +512,10 @@ fraction.</li> <ul> <li>"tbid": Tor Browser initial downloads: GET requests to all sites with resource strings <code>'%/torbrowser/%.exe'</code>, <code>'%/torbrowser/%.dmg'</code>, and <code>'%/torbrowser/%.tar.xz'</code> and response code 200.</li> <li>"tbsd": Tor Browser signature downloads: GET requests to all sites with resource strings <code>'%/torbrowser/%.exe.asc'</code>, <code>'%/torbrowser/%.dmg.asc'</code>, and <code>'%/torbrowser/%.tar.xz.asc'</code> and response code 200.</li> -<li>"tbup": Tor Browser update pings: GET requests to all sites with resource strings <code>'%/torbrowser/update_2/%'</code> and response code 200.</li> +<li>"tbup": Tor Browser update pings: GET requests to all sites with resource strings <code>'%/torbrowser/update\__/%'</code> and response code 200.</li> <li>"tbur": Tor Browser update requests: GET requests to all sites with resource strings <code>'%/torbrowser/%.mar'</code> and response code 302.</li> <li>"tmid": Tor Messenger initial downloads: GET requests to all sites with resource strings <code>'%/tormessenger/%.exe'</code>, <code>'%/tormessenger/%.dmg'</code>, and <code>'%/tormessenger/%.tar.xz'</code> and response code 200.</li> -<li>"tmup": Tor Messenger update pings: GET requests to all sites with resource strings <code>'%/tormessenger/update_2/%'</code> and response code 200.</li> +<li>"tmup": Tor Messenger update pings: GET requests to all sites with resource strings <code>'%/tormessenger/update\__/%'</code> and response code 200.</li> <li>"twhph": Tor website home page hits: GET requests to sites <code>'torproject.org'</code> and <code>'www.torproject.org'</code> with resource strings <code>'/'</code> and <code>'/index%'</code> and response code 200.</li> <li>"twdph": Tor website download page hits: GET requests to sites <code>'torproject.org'</code> and <code>'www.torproject.org'</code> with resource strings <code>'/download/download%'</code> and <code>'/projects/torbrowser.html%'</code> and response code 200.</li> </ul>

1 0

[metrics-lib/master] Test for empty keys in more places.
by karsten＠torproject.org 16 May '17

16 May '17

commit 3c0b08135a2f81d15c5b43c43a1765265a655e57 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 12:06:14 2017 +0200 Test for empty keys in more places. --- .../org/torproject/descriptor/impl/ParseHelper.java | 4 ++-- .../descriptor/impl/ExtraInfoDescriptorImplTest.java | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index e77bded..d5ce50f 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -401,7 +401,7 @@ public class ParseHelper { /* Handle below. */ } } - if (null == key) { + if (null == key || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' " + "contains an illegal key or value in list element '" + listElement + "'."); @@ -483,7 +483,7 @@ public class ParseHelper { /* Handle below. */ } } - if (null == key) { + if (null == key || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'."); diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 5b3fe1f..8b96c88 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1383,6 +1383,15 @@ public class ExtraInfoDescriptorImplTest { } @Test() + public void testDirreqV3RespEmptyString() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage( + "Line 'dirreq-v3-resp =10848' contains an illegal key or value."); + DirreqStatsBuilder.createWithDirreqV3RespLine("dirreq-v3-resp =10848"); + } + + @Test() public void testDirreqV3RespExtraArg() throws DescriptorParseException { DirreqStatsBuilder.createWithDirreqV3RespLine("dirreq-v3-resp " @@ -1624,6 +1633,16 @@ public class ExtraInfoDescriptorImplTest { "exit-kibibytes-written unknown=74647"); } + @Test() + public void testExitStatsWrittenEmptyString() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage("Line 'exit-kibibytes-written =74647' contains " + + "an illegal key or value in list element '=74647'."); + ExitStatsBuilder.createWithExitKibibytesWrittenLine( + "exit-kibibytes-written =74647"); + } + @Test(expected = DescriptorParseException.class) public void testExitStatsReadNegativeBytes() throws DescriptorParseException {

1 0

[metrics-lib/master] Make all tests pass. Implements task-22217.
by karsten＠torproject.org 16 May '17

16 May '17

commit 8456cb154a91f3669507b99b988f9584c895bbc0 Author: iwakeh <iwakeh(a)torproject.org> Date: Sun May 14 17:31:28 2017 +0000 Make all tests pass. Implements task-22217. --- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 0d4a27a..4b70731 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -516,11 +516,15 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null) { + if (key == null || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'."); } + if (result.keySet().contains(key)) { + throw new DescriptorParseException("Line '" + line + "' contains " + + "an already defined key '" + key + "'."); + } result.put(key, value); } return result;

1 0

[metrics-lib/master] Reverse equality test in if-statements.
by karsten＠torproject.org 16 May '17

16 May '17

commit 08ccbf83f7e232ced97ab1a47ab7b7d56b48f8c8 Author: iwakeh <iwakeh(a)torproject.org> Date: Sun May 14 17:31:29 2017 +0000 Reverse equality test in if-statements. (This should be in checkstyle.) --- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 4b70731..e77bded 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -401,7 +401,7 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null) { + if (null == key) { throw new DescriptorParseException("Line '" + line + "' " + "contains an illegal key or value in list element '" + listElement + "'."); @@ -483,7 +483,7 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null) { + if (null == key) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'."); @@ -516,7 +516,7 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null || key.isEmpty()) { + if (null == key || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'.");

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2017