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

[tor/master] minor touchups on nick's ticket 17621 changes
by nickm＠torproject.org 12 May '16

12 May '16

commit 4a62d7aabc4e00d22f27d188f4cb2bb6efb3b674 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 16:35:36 2016 -0400 minor touchups on nick's ticket 17621 changes --- changes/doc17621 | 2 +- doc/tor.1.txt | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/changes/doc17621 b/changes/doc17621 index af61d81..ab37d29 100644 --- a/changes/doc17621 +++ b/changes/doc17621 @@ -1,3 +1,3 @@ o Documentation: - Document the contents of the 'datadir/keys' subdirectory in the manual - page. Closes ticekt 17621. + page. Closes ticket 17621. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5d85935..74915b7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2703,18 +2703,18 @@ __DataDirectory__**/keys/***:: Only used by servers. Holds identity keys and onion keys. __DataDirectory__**/keys/authority_identity_key**:: - A directory authority's master identity key, used to authenticate its + A v3 directory authority's master identity key, used to authenticate its signing key. Tor doesn't use this while it's running. The tor-gencert program uses this. If you're running an authority, you should keep this key offline, and not actually put it here. __DataDirectory__**/keys/authority_certificate**:: - A directory authority's certificate, which authenticates the authority's + A v3 directory authority's certificate, which authenticates the authority's current vote- and consensus-signing key using its master identity key. Only directory authorities use this file. __DataDirectory__**/keys/authority_signing_key**:: - A directory authority's signing key, used to sign votes and consensuses. + A v3 directory authority's signing key, used to sign votes and consensuses. Only directory authorities use this file. Corresponds to the **authority_certificate** cert. @@ -2765,9 +2765,8 @@ __DataDirectory__**/hashed-fingerprint**:: identity key. (That is, the hash of the hash of the identity key.) __DataDirectory__**/v3-status-votes**:: - Only for authoritative directory servers. This file contains status votes - from all the authoritative directory servers and is used to generate the - network consensus document. + Only for v3 authoritative directory servers. This file contains + status votes from all the authoritative directory servers. __DataDirectory__**/unverified-consensus**:: This file contains a network consensus document that has been downloaded,

1 0

[tor/master] Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit d00d3f1c2858f71adfa315ee67d0c2191a793d2a Merge: 163cee1 4a62d7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 10:03:00 2016 -0400 Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8 changes/doc17621 | 3 +++ doc/tor.1.txt | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 12 May '16

12 May '16

commit 6294eb284617b6604067fbf498f8d38d20268132 Merge: 99c0e1b d00d3f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 10:03:26 2016 -0400 Merge branch 'maint-0.2.8' changes/doc17621 | 3 +++ doc/tor.1.txt | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.8] Document the contents of $datadir/keys
by nickm＠torproject.org 12 May '16

12 May '16

commit af4b7d040507a69614fdb526e098a9295acc6c1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 14:03:34 2016 -0400 Document the contents of $datadir/keys Ticket 17621. --- changes/doc17621 | 3 +++ doc/tor.1.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/changes/doc17621 b/changes/doc17621 new file mode 100644 index 0000000..af61d81 --- /dev/null +++ b/changes/doc17621 @@ -0,0 +1,3 @@ + o Documentation: + - Document the contents of the 'datadir/keys' subdirectory in the manual + page. Closes ticekt 17621. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 787223d..5d85935 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2702,6 +2702,61 @@ __DataDirectory__**/lock**:: __DataDirectory__**/keys/***:: Only used by servers. Holds identity keys and onion keys. +__DataDirectory__**/keys/authority_identity_key**:: + A directory authority's master identity key, used to authenticate its + signing key. Tor doesn't use this while it's running. The tor-gencert + program uses this. If you're running an authority, you should keep this + key offline, and not actually put it here. + +__DataDirectory__**/keys/authority_certificate**:: + A directory authority's certificate, which authenticates the authority's + current vote- and consensus-signing key using its master identity key. + Only directory authorities use this file. + +__DataDirectory__**/keys/authority_signing_key**:: + A directory authority's signing key, used to sign votes and consensuses. + Only directory authorities use this file. Corresponds to the + **authority_certificate** cert. + +__DataDirectory__**/keys/legacy_certificate**:: + As authority_certificate: used only when V3AuthUseLegacyKey is set. + See documentation for V3AuthUseLegacyKey. + +__DataDirectory__**/keys/legacy_signing_key**:: + As authority_signing_key: used only when V3AuthUseLegacyKey is set. + See documentation for V3AuthUseLegacyKey. + +__DataDirectory__**/keys/secret_id_key**:: + A relay's RSA1024 permanent identity key, including private and public + components. Used to sign router descriptors, and to sign other keys. + +__DataDirectory__**/keys/ed25519_master_id_public_key**:: + The public part of a relay's Ed25519 permanent identity key. + +__DataDirectory__**/keys/ed25519_master_id_secret_key**:: + The private part of a relay's Ed25519 permanent identity key. This key + is used to sign the medium-term ed25519 signing key. This file can be + kept offline, or kept encrypted. If so, Tor will not be able to generate + new signing keys itself; you'll need to use tor --keygen yourself to do + so. + +__DataDirectory__**/keys/ed25519_signing_secret_key**:: + The private and public components of a relay's medium-term Ed25519 signing + key. This key is authenticated by the Ed25519 master key, in turn + authenticates other keys (and router descriptors). + +__DataDirectory__**/keys/ed25519_signing_cert**:: + The certificate which authenticates "ed25519_signing_secret_key" as + having been signed by the Ed25519 master key. + +__DataDirectory__**/keys/secret_onion_key**:: + A relay's RSA1024 short-term onion key. Used to decrypt old-style ("TAP") + circuit extension requests. + +__DataDirectory__**/keys/secret_onion_key_ntor**:: + A relay's Curve25519 short-term onion key. Used to handle modern ("ntor") + circuit extension requests. + __DataDirectory__**/fingerprint**:: Only used by servers. Holds the fingerprint of the server's identity key.

1 0

[tor/maint-0.2.8] minor touchups on nick's ticket 17621 changes
by nickm＠torproject.org 12 May '16

12 May '16

commit 4a62d7aabc4e00d22f27d188f4cb2bb6efb3b674 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 16:35:36 2016 -0400 minor touchups on nick's ticket 17621 changes --- changes/doc17621 | 2 +- doc/tor.1.txt | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/changes/doc17621 b/changes/doc17621 index af61d81..ab37d29 100644 --- a/changes/doc17621 +++ b/changes/doc17621 @@ -1,3 +1,3 @@ o Documentation: - Document the contents of the 'datadir/keys' subdirectory in the manual - page. Closes ticekt 17621. + page. Closes ticket 17621. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5d85935..74915b7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2703,18 +2703,18 @@ __DataDirectory__**/keys/***:: Only used by servers. Holds identity keys and onion keys. __DataDirectory__**/keys/authority_identity_key**:: - A directory authority's master identity key, used to authenticate its + A v3 directory authority's master identity key, used to authenticate its signing key. Tor doesn't use this while it's running. The tor-gencert program uses this. If you're running an authority, you should keep this key offline, and not actually put it here. __DataDirectory__**/keys/authority_certificate**:: - A directory authority's certificate, which authenticates the authority's + A v3 directory authority's certificate, which authenticates the authority's current vote- and consensus-signing key using its master identity key. Only directory authorities use this file. __DataDirectory__**/keys/authority_signing_key**:: - A directory authority's signing key, used to sign votes and consensuses. + A v3 directory authority's signing key, used to sign votes and consensuses. Only directory authorities use this file. Corresponds to the **authority_certificate** cert. @@ -2765,9 +2765,8 @@ __DataDirectory__**/hashed-fingerprint**:: identity key. (That is, the hash of the hash of the identity key.) __DataDirectory__**/v3-status-votes**:: - Only for authoritative directory servers. This file contains status votes - from all the authoritative directory servers and is used to generate the - network consensus document. + Only for v3 authoritative directory servers. This file contains + status votes from all the authoritative directory servers. __DataDirectory__**/unverified-consensus**:: This file contains a network consensus document that has been downloaded,

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit d00d3f1c2858f71adfa315ee67d0c2191a793d2a Merge: 163cee1 4a62d7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 10:03:00 2016 -0400 Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8 changes/doc17621 | 3 +++ doc/tor.1.txt | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix bad allocation in pubsub.c
by nickm＠torproject.org 12 May '16

12 May '16

commit 99c0e1bd5b3974c8bf767487e7cf9a9193a3c91a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 09:56:42 2016 -0400 Fix bad allocation in pubsub.c Closes 19038. Bug not in any released Tor. --- src/common/pubsub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/pubsub.c b/src/common/pubsub.c index 98ec3f8..b3faf40 100644 --- a/src/common/pubsub.c +++ b/src/common/pubsub.c @@ -48,7 +48,7 @@ pubsub_subscribe_(pubsub_topic_t *topic, if (subscribe_flags & SUBSCRIBE_ATSTART) { tor_assert(topic->n_events_fired == 0); } - pubsub_subscriber_t *r = tor_malloc_zero(sizeof(r)); + pubsub_subscriber_t *r = tor_malloc_zero(sizeof(*r)); r->priority = priority; r->subscriber_flags = subscribe_flags; r->fn = fn;

1 0

[torbirdy/master] Fix indentation in feedwizard.js
by sukhbir＠torproject.org 12 May '16

12 May '16

commit 405564bc67868489607fab60c7e66beaa5f4ce00 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 11 21:49:54 2016 -0400 Fix indentation in feedwizard.js --- chrome/content/feedwizard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/feedwizard.js b/chrome/content/feedwizard.js index 07b01bc..e0698a1 100644 --- a/chrome/content/feedwizard.js +++ b/chrome/content/feedwizard.js @@ -15,8 +15,8 @@ if (!org.torbirdy.feedwizard) org.torbirdy.feedwizard = new function() { ]; for each (var [pref_template, value] in pref_spec) { - let pref = pref_template.replace("%serverkey%", accountKey); - Preferences.set(pref, value); + let pref = pref_template.replace("%serverkey%", accountKey); + Preferences.set(pref, value); } };

1 0

[torbirdy/master] Disable HTML for RSS feeds
by sukhbir＠torproject.org 12 May '16

12 May '16

commit 174cd106b9708d22c9825d6611b13d1f22d7397a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 11 15:34:48 2016 -0400 Disable HTML for RSS feeds --- components/torbirdy.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 4f83513..2740c64 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -231,8 +231,11 @@ const TorBirdyPrefs = { // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, - // Prefer plain text for RSS. + // RSS. "rss.display.prefer_plaintext": true, + // These are similar to the mailnews.* settings. + "rss.display.disallow_mime_handlers": 3, + "rss.display.html_as": 1, // Override the user agent by setting it to an empty string. "general.useragent.override": "",

1 0

[torbirdy/master] Add overlay to disable automatic checking and fetching of RSS feeds (#19031)
by sukhbir＠torproject.org 12 May '16

12 May '16

commit 0968621f307da8a9a0fcf6de9b30fb757169ccfe Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 11 21:32:14 2016 -0400 Add overlay to disable automatic checking and fetching of RSS feeds (#19031) To disable checking of new articles on startup and after a fixed interval (100 minutes as defined in FeedUtils.jsm), add an overlay which disables both these settings after a new RSS account is created. This is similar to what we are doing with the manual email configuration wizard. --- chrome.manifest | 1 + chrome/content/feedwizard.js | 43 +++++++++++++++++++++++++++++++++++++++++++ chrome/content/feedwizard.xul | 10 ++++++++++ 3 files changed, 54 insertions(+) diff --git a/chrome.manifest b/chrome.manifest index 78f1183..431b4c9 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -3,6 +3,7 @@ content castironthunderbirdclub chrome/content/ overlay chrome://messenger/content/messenger.xul chrome://castironthunderbirdclub/content/overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://castironthunderbirdclub/content/composeoverlay.xul overlay chrome://messenger/content/accountcreation/emailWizard.xul chrome://castironthunderbirdclub/content/emailwizard.xul +overlay chrome://messenger-newsblog/content/feedAccountWizard.xul chrome://castironthunderbirdclub/content/feedwizard.xul component {ebd85413-18c8-4265-a708-a8890ec8d1ed} components/torbirdy.js contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed} diff --git a/chrome/content/feedwizard.js b/chrome/content/feedwizard.js new file mode 100644 index 0000000..07b01bc --- /dev/null +++ b/chrome/content/feedwizard.js @@ -0,0 +1,43 @@ +Components.utils.import("resource://gre/modules/Preferences.jsm"); + +if (!org) var org = {}; +if (!org.torbirdy) org.torbirdy = {}; + +if (!org.torbirdy.feedwizard) org.torbirdy.feedwizard = new function() { + var pub = {}; + + pub.fixFeedAccount = function(account) { + let accountKey = account.incomingServer.key; + + let pref_spec = [ + ['mail.server.%serverkey%.check_new_mail', false], + ['mail.server.%serverkey%.login_at_startup', false] + ]; + + for each (var [pref_template, value] in pref_spec) { + let pref = pref_template.replace("%serverkey%", accountKey); + Preferences.set(pref, value); + } + }; + + // From comm-release/mailnews/extensions/newsblog/content/feedAccountWizard.js : onFinish(). + // We need to disable automatic checking of articles on startup and every X + // (100 is the default) minutes. Since these values are in FeedUtils.jsm, we + // use this overlay, create the account, and then apply our settings. + FeedAccountWizard.onFinish = function() { + let account = FeedUtils.createRssAccount(this.accountName); + if ("gFolderTreeView" in window.opener.top) + // Opened from 3pane File->New or Appmenu New Message, or + // Account Central link. + window.opener.top.gFolderTreeView.selectFolder(account.incomingServer.rootMsgFolder); + else if ("selectServer" in window.opener) + // Opened from Account Settings. + window.opener.selectServer(account.incomingServer); + + // Now apply the settings. + pub.fixFeedAccount(account); + window.close(); + }; + + return pub; +}; diff --git a/chrome/content/feedwizard.xul b/chrome/content/feedwizard.xul new file mode 100644 index 0000000..2f3c935 --- /dev/null +++ b/chrome/content/feedwizard.xul @@ -0,0 +1,10 @@ +<?xml version="1.0"?> + +<?xml-stylesheet href="chrome://messenger/skin/accountWizard.css" type="text/css"?> + +<wizard id="castironthunderbirdclub-feedwizard-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/feedwizard.js" /> + +</wizard>

1 0