August 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket22348_031' into maint-0.3.1
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 63fc23f8260e2723182fbd8476df78559be325d3 Merge: 6069c829f ab166fe68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:44:18 2017 -0400 Merge branch 'ticket22348_031' into maint-0.3.1 changes/ticket22348 | 5 +++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Try to improve the keypinning-failure message even more
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit ab166fe68faa87237c767a38682271b22ce8c029 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:35:30 2017 -0400 Try to improve the keypinning-failure message even more --- src/or/dirserv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4c5309b3b..acd00322a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -723,7 +723,9 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) *msg = "Looks like your keypair has changed? This authority previously " "recorded a different RSA identity for this Ed25519 identity (or vice " "versa.) Did you replace or copy some of your key files, but not " - "the others?"; + "the others? You should either restore the expected keypair, or " + "delete your keys and restart Tor to start your relay with a new " + "identity."; r = ROUTER_AUTHDIR_REJECTS; goto fail; }

1 0

[tor/release-0.3.1] Improve the keypin failure message
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit ec99f038fa6dd5207bc277d9efc815c8d29de52d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 31 20:40:23 2017 -0400 Improve the keypin failure message Closes the human-factors part of ticket 22348. --- changes/ticket22348 | 5 +++++ src/or/dirserv.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket22348 b/changes/ticket22348 new file mode 100644 index 000000000..49ae94cdf --- /dev/null +++ b/changes/ticket22348 @@ -0,0 +1,5 @@ + o Minor features (directory authority): + - Improve the message that authorities report to relays when + the RSA/Ed25519 key pair they present conflicts with a previously + pinned key. Closes ticket 22348. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 468fdbd48..4c5309b3b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -720,7 +720,10 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) log_info(LD_DIRSERV, "Dropping descriptor from %s (source: %s) because " "its key did not match an older RSA/Ed25519 keypair", router_describe(ri), source); - *msg = "Looks like your keypair does not match its older value."; + *msg = "Looks like your keypair has changed? This authority previously " + "recorded a different RSA identity for this Ed25519 identity (or vice " + "versa.) Did you replace or copy some of your key files, but not " + "the others?"; r = ROUTER_AUTHDIR_REJECTS; goto fail; }

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 51d14b3d478a94c410a695f736445f42ccc23fb9 Merge: 1dd0be75c 63fc23f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:44:25 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket22348 | 5 +++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'ticket22348_031' into maint-0.3.1
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 63fc23f8260e2723182fbd8476df78559be325d3 Merge: 6069c829f ab166fe68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:44:18 2017 -0400 Merge branch 'ticket22348_031' into maint-0.3.1 changes/ticket22348 | 5 +++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/master] Improve the keypin failure message
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit ec99f038fa6dd5207bc277d9efc815c8d29de52d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 31 20:40:23 2017 -0400 Improve the keypin failure message Closes the human-factors part of ticket 22348. --- changes/ticket22348 | 5 +++++ src/or/dirserv.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket22348 b/changes/ticket22348 new file mode 100644 index 000000000..49ae94cdf --- /dev/null +++ b/changes/ticket22348 @@ -0,0 +1,5 @@ + o Minor features (directory authority): + - Improve the message that authorities report to relays when + the RSA/Ed25519 key pair they present conflicts with a previously + pinned key. Closes ticket 22348. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 468fdbd48..4c5309b3b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -720,7 +720,10 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) log_info(LD_DIRSERV, "Dropping descriptor from %s (source: %s) because " "its key did not match an older RSA/Ed25519 keypair", router_describe(ri), source); - *msg = "Looks like your keypair does not match its older value."; + *msg = "Looks like your keypair has changed? This authority previously " + "recorded a different RSA identity for this Ed25519 identity (or vice " + "versa.) Did you replace or copy some of your key files, but not " + "the others?"; r = ROUTER_AUTHDIR_REJECTS; goto fail; }

1 0

[tor/master] Try to improve the keypinning-failure message even more
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit ab166fe68faa87237c767a38682271b22ce8c029 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:35:30 2017 -0400 Try to improve the keypinning-failure message even more --- src/or/dirserv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4c5309b3b..acd00322a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -723,7 +723,9 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) *msg = "Looks like your keypair has changed? This authority previously " "recorded a different RSA identity for this Ed25519 identity (or vice " "versa.) Did you replace or copy some of your key files, but not " - "the others?"; + "the others? You should either restore the expected keypair, or " + "delete your keys and restart Tor to start your relay with a new " + "identity."; r = ROUTER_AUTHDIR_REJECTS; goto fail; }

1 0

[tor/master] Merge branch 'ticket22348_031'
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit c107aae3c29bb0f62586ffef4c636ae2f47e746b Merge: 4b4b3afb5 ab166fe68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:43:55 2017 -0400 Merge branch 'ticket22348_031' changes/ticket22348 | 5 +++++ src/or/dirserv.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[torspec/master] prop281: Clarification based on comments from teor
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit ed88a5d4d930928d687f82ee3d47d96e6ee11c30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:32:28 2017 -0400 prop281: Clarification based on comments from teor --- proposals/281-bulk-md-download.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/proposals/281-bulk-md-download.txt b/proposals/281-bulk-md-download.txt index 9b1d669..38c0a20 100644 --- a/proposals/281-bulk-md-download.txt +++ b/proposals/281-bulk-md-download.txt @@ -36,7 +36,9 @@ Status: Draft If answering, caches MUST reply with all of the microdescriptors that the cache holds that were listed by consensus X, and MUST omit all the microdescriptors that were - omitted listed in consensus Y. + not listed in consensus Y. (For the purposes of this proposal, + microdescriptors are "the same" if they are textually identical + and have the same digest.) 2.2. By consensus: @@ -52,10 +54,18 @@ Status: Draft 2.3. When to make these requests - Clients should decide to use this format in preference to the - old download-by-digest format if the consensus X lists their - preferred directory cache as using a new DirCache subprotocol - version. (See 5 below.) + Clients should decide to use this format in preference to the old + download-by-digest format if the consensus X lists their preferred + directory cache as using a new DirCache subprotocol version. (See + 5 below.) + + When a client has some preferred directory caches that support + this subprotocol and some that do not, it chooses one at random, + and uses these requests if that one supports this subprotocol. + + (A client always has a consensus when it requests + microdescriptors, so it will know whether any given cache supports + these requests.) 3. Performance analysis

1 0

[torspec/master] prop281: Fix a duplicate phrase
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 502fd7b0f5469940590013856eb4762ad4f17d68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 11:25:18 2017 -0400 prop281: Fix a duplicate phrase --- proposals/281-bulk-md-download.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proposals/281-bulk-md-download.txt b/proposals/281-bulk-md-download.txt index bd02aef..9b1d669 100644 --- a/proposals/281-bulk-md-download.txt +++ b/proposals/281-bulk-md-download.txt @@ -32,7 +32,8 @@ Status: Draft Caches MUST NOT answer this request unless they recognize the consensus with digest X, and digest Y. - digest Y. If answering, caches MUST reply with all of the + + If answering, caches MUST reply with all of the microdescriptors that the cache holds that were listed by consensus X, and MUST omit all the microdescriptors that were omitted listed in consensus Y.

1 0