September 2019 - tor-commits - lists.torproject.org

[tor/master] changes file for microdesc_parse refactoring.
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 6100378c29072dda5264d9e88993133f484df168 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 9 15:48:58 2019 -0400 changes file for microdesc_parse refactoring. --- changes/ticket31675 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket31675 b/changes/ticket31675 new file mode 100644 index 000000000..2b426948f --- /dev/null +++ b/changes/ticket31675 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor the microdescs_parse_from_string() function into smaller + pieces, for better comprehensibility. Closes ticket 31675.

1 0

[tor/master] Merge branch 'tor-github/pr/1309'
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 99f75373def3520fac4f00c072748f2a0886c923 Merge: 0cb57a490 c30916921 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 25 14:12:42 2019 +0300 Merge branch 'tor-github/pr/1309' changes/ticket31675 | 3 + scripts/maint/practracker/exceptions.txt | 1 - src/feature/dirparse/microdesc_parse.c | 320 ++++++++++++++++++------------- src/test/test_microdesc.c | 76 ++++++++ 4 files changed, 271 insertions(+), 129 deletions(-)

1 0

[tor/master] microdesc_parse: convert some ints to bools
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit c309169217eace3eaee84f3dc16347234929e4b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 19 13:59:37 2019 -0400 microdesc_parse: convert some ints to bools Noted by ahf during review of #31675 --- src/feature/dirparse/microdesc_parse.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index 96a345426..4bb4db782 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -140,11 +140,11 @@ microdesc_extract_body(microdesc_t *md, const char *s, const char *start_of_next_microdesc, saved_location_t where) { - const int copy_body = (where != SAVED_IN_CACHE); + const bool copy_body = (where != SAVED_IN_CACHE); const char *cp = tor_memstr(s, start_of_next_microdesc-s, "onion-key"); - const int no_onion_key = (cp == NULL); + const bool no_onion_key = (cp == NULL); if (no_onion_key) { cp = s; /* So that we have *some* junk to put in the body */ } @@ -307,7 +307,7 @@ microdescs_parse_from_string(const char *s, const char *eos, result = smartlist_new(); while (s < eos) { - int okay = 0; + bool okay = false; start_of_next_microdesc = find_start_of_next_microdesc(s, eos); if (!start_of_next_microdesc) @@ -316,9 +316,10 @@ microdescs_parse_from_string(const char *s, const char *eos, md = tor_malloc_zero(sizeof(microdesc_t)); uint8_t md_digest[DIGEST256_LEN]; { - int body_not_found = microdesc_extract_body(md, start, s, - start_of_next_microdesc, - where) < 0; + const bool body_not_found = + microdesc_extract_body(md, start, s, + start_of_next_microdesc, + where) < 0; memcpy(md_digest, md->digest, DIGEST256_LEN); if (body_not_found) { @@ -331,7 +332,7 @@ microdescs_parse_from_string(const char *s, const char *eos, allow_annotations, where) == 0) { smartlist_add(result, md); md = NULL; // prevent free - okay = 1; + okay = true; } next:

1 0

[tor/master] Extract saved_location_to_string() from microdesc parsing.
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 7282213bd3aa1b21928e7d134180781158ebdb4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 9 12:56:04 2019 -0400 Extract saved_location_to_string() from microdesc parsing. We may be able to use this function in other places in the future; if so, we should move it to somewhere more useful. Part of 31675. --- src/feature/dirparse/microdesc_parse.c | 43 +++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index e02dfcf11..441c3bb83 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -98,6 +98,31 @@ policy_is_reject_star_or_null(struct short_policy_t *policy) return !policy || short_policy_is_reject_star(policy); } +/** + * Return a human-readable description of a given saved_location_t. + * Never returns NULL. + **/ +static const char * +saved_location_to_string(saved_location_t where) +{ + const char *location; + switch (where) { + case SAVED_NOWHERE: + location = "download or generated string"; + break; + case SAVED_IN_CACHE: + location = "cache"; + break; + case SAVED_IN_JOURNAL: + location = "journal"; + break; + default: + location = "unknown location"; + break; + } + return location; +} + /** Parse as many microdescriptors as are found from the string starting at * s and ending at eos. If allow_annotations is set, read any * annotations we recognize and ignore ones we don't. @@ -166,22 +191,8 @@ microdescs_parse_from_string(const char *s, const char *eos, if (tokenize_string(area, s, start_of_next_microdesc, tokens, microdesc_token_table, flags)) { - const char *location; - switch (where) { - case SAVED_NOWHERE: - location = "download or generated string"; - break; - case SAVED_IN_CACHE: - location = "cache"; - break; - case SAVED_IN_JOURNAL: - location = "journal"; - break; - default: - location = "unknown location"; - break; - } - log_warn(LD_DIR, "Unparseable microdescriptor found in %s", location); + log_warn(LD_DIR, "Unparseable microdescriptor found in %s", + saved_location_to_string(where)); goto next; }

1 0

[tor/master] Do not look inside bogus microdesc when listing its digest as invalid
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit e7d7e04155f0c7dd1282d4c77bdd02cae8bc0fe7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 9 12:58:30 2019 -0400 Do not look inside bogus microdesc when listing its digest as invalid We have code in microdescs_parse_from_string() to record the digests of microdescriptors that we could not parse. But right now, that code looks at the md->digest field, which is a bit inelegant, and will stand in the way of sensible refactoring. Instead, use a local variable to hold the digest. --- src/feature/dirparse/microdesc_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index 441c3bb83..e77166066 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -167,6 +167,7 @@ microdescs_parse_from_string(const char *s, const char *eos, start_of_next_microdesc = eos; md = tor_malloc_zero(sizeof(microdesc_t)); + uint8_t md_digest[DIGEST256_LEN]; { const char *cp = tor_memstr(s, start_of_next_microdesc-s, "onion-key"); @@ -183,6 +184,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md->body = (char*)cp; md->off = cp - start; crypto_digest256(md->digest, md->body, md->bodylen, DIGEST_SHA256); + memcpy(md_digest, md->digest, DIGEST256_LEN); if (no_onion_key) { log_fn(LOG_PROTOCOL_WARN, LD_DIR, "Malformed or truncated descriptor"); goto next; @@ -279,7 +281,7 @@ microdescs_parse_from_string(const char *s, const char *eos, next: if (! okay && invalid_digests_out) { smartlist_add(invalid_digests_out, - tor_memdup(md->digest, DIGEST256_LEN)); + tor_memdup(md_digest, DIGEST256_LEN)); } microdesc_free(md); md = NULL;

1 0

[tor/master] Extract the body-copying portion of microdesc parsing
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 9cbc166ea038e51baec92c8f37a2646c76a97480 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 9 15:21:01 2019 -0400 Extract the body-copying portion of microdesc parsing This code is logically independent of the rest of the function, and goes better in its own function. This is almost purely code movement; I suggest reviewing with --color-moved. --- src/feature/dirparse/microdesc_parse.c | 59 +++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index e77166066..621e3c10d 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -123,6 +123,45 @@ saved_location_to_string(saved_location_t where) return location; } +/** + * Given a microdescriptor stored in where which starts at s, + * which ends at start_of_next_microdescriptor, and which is located + * within a larger document beginning at start: Fill in the body, + * bodylen, bodylen, saved_location, off, and digest fields of md as + * appropriate. + * + * The body field will be an alias within s if saved_location + * is SAVED_IN_CACHE, and will be copied into body and nul-terminated + * otherwise. + **/ +static int +microdesc_extract_body(microdesc_t *md, + const char *start, + const char *s, const char *start_of_next_microdesc, + saved_location_t where) +{ + const int copy_body = (where != SAVED_IN_CACHE); + + const char *cp = tor_memstr(s, start_of_next_microdesc-s, + "onion-key"); + const int no_onion_key = (cp == NULL); + if (no_onion_key) { + cp = s; /* So that we have *some* junk to put in the body */ + } + + md->bodylen = start_of_next_microdesc - cp; + md->saved_location = where; + if (copy_body) + md->body = tor_memdup_nulterm(cp, md->bodylen); + else + md->body = (char*)cp; + md->off = cp - start; + + crypto_digest256(md->digest, md->body, md->bodylen, DIGEST_SHA256); + + return no_onion_key ? -1 : 0; +} + /** Parse as many microdescriptors as are found from the string starting at * s and ending at eos. If allow_annotations is set, read any * annotations we recognize and ignore ones we don't. @@ -147,7 +186,6 @@ microdescs_parse_from_string(const char *s, const char *eos, const char *start = s; const char *start_of_next_microdesc; int flags = allow_annotations ? TS_ANNOTATIONS_OK : 0; - const int copy_body = (where != SAVED_IN_CACHE); directory_token_t *tok; @@ -169,23 +207,12 @@ microdescs_parse_from_string(const char *s, const char *eos, md = tor_malloc_zero(sizeof(microdesc_t)); uint8_t md_digest[DIGEST256_LEN]; { - const char *cp = tor_memstr(s, start_of_next_microdesc-s, - "onion-key"); - const int no_onion_key = (cp == NULL); - if (no_onion_key) { - cp = s; /* So that we have *some* junk to put in the body */ - } + int body_not_found = microdesc_extract_body(md, start, s, + start_of_next_microdesc, + where) < 0; - md->bodylen = start_of_next_microdesc - cp; - md->saved_location = where; - if (copy_body) - md->body = tor_memdup_nulterm(cp, md->bodylen); - else - md->body = (char*)cp; - md->off = cp - start; - crypto_digest256(md->digest, md->body, md->bodylen, DIGEST_SHA256); memcpy(md_digest, md->digest, DIGEST256_LEN); - if (no_onion_key) { + if (body_not_found) { log_fn(LOG_PROTOCOL_WARN, LD_DIR, "Malformed or truncated descriptor"); goto next; }

1 0

[tor/master] Add a unit test for ed25519 identity parsing in microdescriptors
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit d8ef6b154890e1b6e8842c68ebd68d954c852e38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 9 20:24:03 2019 -0400 Add a unit test for ed25519 identity parsing in microdescriptors This test makes sure that we parse ed25519 identities to get the correct data from them. It also tests: * That a microdescriptor may not have two ed25519 identities. * That a microdescriptor may not have an ed25519 identity that is not a valid base64-encoded ed25519 key. * That a microdescriptor may have an unrecognized identity type. It will help test the refactoring of ticket31675. --- src/test/test_microdesc.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index ad211c7ea..804e6c546 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -21,6 +21,7 @@ #include "feature/nodelist/routerstatus_st.h" #include "test/test.h" +#include "test/log_test_helpers.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -770,6 +771,80 @@ test_md_parse(void *arg) tor_free(mem_op_hex_tmp); } +static void +test_md_parse_id_ed25519(void *arg) +{ + (void)arg; + + /* A correct MD with an ed25519 ID ... and an unspecified ID type, + * which is permitted. */ + const char GOOD_MD[] = + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n" + "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n" + "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "id ed25519 VGhpcyBpc24ndCBhY3R1YWxseSBhIHB1YmxpYyBrZXk\n" + "id wumpus dodecahedron\n"; + + smartlist_t *mds = NULL; + const microdesc_t *md; + + mds = microdescs_parse_from_string(GOOD_MD, + NULL, 1, SAVED_NOWHERE, NULL); + tt_assert(mds); + tt_int_op(smartlist_len(mds), OP_EQ, 1); + md = smartlist_get(mds, 0); + tt_mem_op(md->ed25519_identity_pkey, OP_EQ, + "This isn't actually a public key", ED25519_PUBKEY_LEN); + SMARTLIST_FOREACH(mds, microdesc_t *, m, microdesc_free(m)); + smartlist_free(mds); + + /* As above, but ed25519 ID key appears twice. */ + const char DUPLICATE_KEY[] = + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n" + "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n" + "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "id ed25519 VGhpcyBpc24ndCBhY3R1YWxseSBhIHB1YmxpYyBrZXk\n" + "id ed25519 VGhpcyBpc24ndCBhY3R1YWxseSBhIHB1YmxpYyBrZXk\n"; + + setup_capture_of_logs(LOG_WARN); + mds = microdescs_parse_from_string(DUPLICATE_KEY, + NULL, 1, SAVED_NOWHERE, NULL); + tt_assert(mds); + tt_int_op(smartlist_len(mds), OP_EQ, 0); // no entries. + expect_single_log_msg_containing("Extra ed25519 key"); + mock_clean_saved_logs(); + smartlist_free(mds); + + /* As above, but ed25519 ID key is invalid. */ + const char BOGUS_KEY[] = + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM7uUtq5F6h63QNYIvC+4NcWaD0DjtnrOORZMkdpJhinXUOwce3cD5Dj\n" + "sgdN1wJpWpTQMXJ2DssfSgmOVXETP7qJuZyRprxalQhaEATMDNJA/66Ml1jSO9mZ\n" + "+8Xb7m/4q778lNtkSbsvMaYD2Dq6k2QQ3kMhr9z8oUtX0XA23+pfAgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "id ed25519 VGhpcyBpc24ndCBhY3R1YWxseSBhIHB1YmxpYyZZZZZZZZZZZ\n"; + + mds = microdescs_parse_from_string(BOGUS_KEY, + NULL, 1, SAVED_NOWHERE, NULL); + tt_assert(mds); + tt_int_op(smartlist_len(mds), OP_EQ, 0); // no entries. + expect_single_log_msg_containing("Bogus ed25519 key"); + + done: + if (mds) { + SMARTLIST_FOREACH(mds, microdesc_t *, m, microdesc_free(m)); + smartlist_free(mds); + } + teardown_capture_of_logs(); +} + static int mock_rgsbd_called = 0; static routerstatus_t *mock_rgsbd_val_a = NULL; static routerstatus_t *mock_rgsbd_val_b = NULL; @@ -903,6 +978,7 @@ struct testcase_t microdesc_tests[] = { { "broken_cache", test_md_cache_broken, TT_FORK, NULL, NULL }, { "generate", test_md_generate, 0, NULL, NULL }, { "parse", test_md_parse, 0, NULL, NULL }, + { "parse_id_ed25519", test_md_parse_id_ed25519, 0, NULL, NULL }, { "reject_cache", test_md_reject_cache, TT_FORK, NULL, NULL }, { "corrupt_desc", test_md_corrupt_desc, TT_FORK, NULL, NULL }, END_OF_TESTCASES

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit fa3095e61aacd345601435a0e91ee2b44e1a9b07 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 12:56:39 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31575: Disable newtabpage --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 10c31084adcc..09386d32a12c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -106,6 +106,7 @@ pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. +pref("browser.newtabpage.enabled", false); pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", "");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31575: Replace Firefox Home (newtab) with about:tor
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e11a1889ae871a9ced871346f5f9eb3e0a9ab6d3 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 13:04:34 2019 +0200 Bug 31575: Replace Firefox Home (newtab) with about:tor Patching AboutNewTabService so that AboutNewTab is not loaded to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. --- browser/components/newtab/AboutNewTabService.jsm | 29 +--------------------- browser/components/preferences/in-content/home.xul | 4 +-- .../preferences/in-content/preferences.xul | 5 +++- browser/modules/HomePage.jsm | 2 +- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm index 8995d82d543b..117b9d6347cd 100644 --- a/browser/components/newtab/AboutNewTabService.jsm +++ b/browser/components/newtab/AboutNewTabService.jsm @@ -10,9 +10,6 @@ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "AboutNewTab", - "resource:///modules/AboutNewTab.jsm"); - const TOPIC_APP_QUIT = "quit-application-granted"; const TOPIC_LOCALES_CHANGE = "intl:app-locales-changed"; const TOPIC_CONTENT_DOCUMENT_INTERACTIVE = "content-document-interactive"; @@ -47,12 +44,6 @@ function AboutNewTabService() { this.toggleActivityStream(true); this.initialized = true; this.alreadyRecordedTopsitesPainted = false; - - if (IS_MAIN_PROCESS) { - AboutNewTab.init(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.addObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } } /* @@ -179,11 +170,6 @@ AboutNewTabService.prototype = { } case TOPIC_APP_QUIT: this.uninit(); - if (IS_MAIN_PROCESS) { - AboutNewTab.uninit(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.removeObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } break; case TOPIC_LOCALES_CHANGE: this.updatePrerenderedPath(); @@ -243,20 +229,7 @@ AboutNewTabService.prototype = { * the newtab page has no effect on the result of this function. */ get defaultURL() { - // Generate the desired activity stream resource depending on state, e.g., - // resource://activity-stream/prerendered/ar/activity-stream.html - // resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html - // resource://activity-stream/prerendered/static/activity-stream-debug.html - return [ - "resource://activity-stream/prerendered/", - this._activityStreamPath, - "activity-stream", - this._activityStreamPrerender ? "-prerendered" : "", - // Debug version loads dev scripts but noscripts separately loads scripts - this._activityStreamDebug && !this._privilegedContentProcess ? "-debug" : "", - this._privilegedContentProcess ? "-noscripts" : "", - ".html", - ].join(""); + return "about:tor"; }, /* diff --git a/browser/components/preferences/in-content/home.xul b/browser/components/preferences/in-content/home.xul index 8c38ba68c2af..fc555a2f56af 100644 --- a/browser/components/preferences/in-content/home.xul +++ b/browser/components/preferences/in-content/home.xul @@ -37,7 +37,7 @@ class="check-home-page-controlled" data-preference-related="browser.startup.homepage"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="2" data-l10n-id="home-mode-choice-custom" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> @@ -79,7 +79,7 @@ onsyncfrompreference="return gHomePane.syncFromNewTabPref();" onsynctopreference="return gHomePane.syncToNewTabPref(this.value);"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> </menulist> diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 13c7bcc74ad8..3b07e4596907 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -17,7 +17,10 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> -<!DOCTYPE page> +<!DOCTYPE page [ +<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> + %aboutTorDTD; +]> <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm index f888f185c6a8..2519f3eaa754 100644 --- a/browser/modules/HomePage.jsm +++ b/browser/modules/HomePage.jsm @@ -17,7 +17,7 @@ ChromeUtils.defineModuleGetter( ); const kPrefName = "browser.startup.homepage"; -const kDefaultHomePage = "about:home"; +const kDefaultHomePage = "about:tor"; function getHomepagePref(useDefault) { let homePage;

1 0

[research-web/master] Add Nick's and Mike's tech report 2018-11-002.
by irl＠torproject.org 25 Sep '19

25 Sep '19

commit 1bf995ea427e210287c7309c133dc37c0a00a667 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 23 10:33:55 2019 +0200 Add Nick's and Mike's tech report 2018-11-002. --- content/techreports.html | 10 ++++++++++ static/techreports/side-channel-analysis-2018-11-27.pdf | Bin 0 -> 83513 bytes static/techreports_bib.html | 12 ++++++++++++ techreports.bib | 10 ++++++++++ techreports.html | 10 ++++++++++ 5 files changed, 42 insertions(+) diff --git a/content/techreports.html b/content/techreports.html index da8c9b5..dae4c56 100644 --- a/content/techreports.html +++ b/content/techreports.html @@ -59,6 +59,16 @@ Antonela Debiasi, Roger Dingledine, Arthur Edelstein, Alexander Fær&o +<a name="tor-2018-11-002"></a> + +Nick Mathewson and Mike Perry. + Towards side channel analysis of datagram Tor vs current Tor. + Technical Report 2018-11-002, The Tor Project, November 2018. +[ <a href="../techreports_bib.html#tor-2018-11-002">bib</a> | +<a href="https://research.torproject.org/techreports/side-channel-analysis-2018-11-2…">.pdf</a> ] + + + <a name="tor-2017-04-001"></a> Karin Herm. diff --git a/static/techreports/side-channel-analysis-2018-11-27.pdf b/static/techreports/side-channel-analysis-2018-11-27.pdf new file mode 100644 index 0000000..18abcad Binary files /dev/null and b/static/techreports/side-channel-analysis-2018-11-27.pdf differ diff --git a/static/techreports_bib.html b/static/techreports_bib.html index b1213e1..838bd75 100644 --- a/static/techreports_bib.html +++ b/static/techreports_bib.html @@ -34,6 +34,18 @@ } </pre> +<a name="tor-2018-11-002"></a><pre> +@techreport{<a href="techreports.html#tor-2018-11-002">tor-2018-11-002</a>, + author = {Nick Mathewson and Mike Perry}, + title = {Towards Side Channel Analysis of Datagram {Tor} vs Current {Tor}}, + institution = {The Tor Project}, + number = {2018-11-002}, + year = {2018}, + month = {November}, + url = {https://research.torproject.org/techreports/side-channel-analysis-2018-11-27.pdf} +} +</pre> + <a name="tor-2018-11-001"></a><pre> @techreport{<a href="techreports.html#tor-2018-11-001">tor-2018-11-001</a>, author = {Antonela Debiasi and Roger Dingledine and Arthur Edelstein and Alexander F\ae r\o y and Matthew Finkel and David Goulet and Kat Hanna and Maggie Haughey and George Kadianakis and Iain R. Learmonth and Alison Macrina and Maria Xynou}, diff --git a/techreports.bib b/techreports.bib index a69ebac..cb5e1e0 100644 --- a/techreports.bib +++ b/techreports.bib @@ -28,6 +28,16 @@ url = {https://research.torproject.org/techreports/modern-collector-2018-12-19.pdf}, } +@techreport{tor-2018-11-002, + author = {Nick Mathewson and Mike Perry}, + title = {Towards Side Channel Analysis of Datagram {Tor} vs Current {Tor}}, + institution = {The Tor Project}, + number = {2018-11-002}, + year = {2018}, + month = {November}, + url = {https://research.torproject.org/techreports/side-channel-analysis-2018-11-27.pdf}, +} + @techreport{tor-2018-11-001, author = {Antonela Debiasi and Roger Dingledine and Arthur Edelstein and Alexander F\ae r\o y and Matthew Finkel and David Goulet and Kat Hanna and Maggie Haughey and George Kadianakis and Iain R. Learmonth and Alison Macrina and Maria Xynou}, title = {Addressing Denial of Service Attacks on Free and Open Communication on the Internet}, diff --git a/techreports.html b/techreports.html index 90cee5c..0dc96bf 100644 --- a/techreports.html +++ b/techreports.html @@ -53,6 +53,16 @@ Antonela Debiasi, Roger Dingledine, Arthur Edelstein, Alexander Fær&o +<a name="tor-2018-11-002"></a> + +Nick Mathewson and Mike Perry. + Towards side channel analysis of datagram Tor vs current Tor. + Technical Report 2018-11-002, The Tor Project, November 2018. +[ <a href="techreports_bib.html#tor-2018-11-002">bib</a> | +<a href="https://research.torproject.org/techreports/side-channel-analysis-2018-11-2…">.pdf</a> ] + + + <a name="tor-2017-04-001"></a> Karin Herm.

1 0