- tor-commits - lists.torproject.org

[tor/release-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/release-0.2.8] Have correct_tm set tm_wday as well.
by nickm＠torproject.org 12 May '16

12 May '16

commit e57f26c135b03f5dbde77aea24551b6a9fc20889 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 10:49:55 2016 -0400 Have correct_tm set tm_wday as well. The tm_wday field had been left uninitialized, which was causing some assertions to fail on Windows unit tests. Fixes bug 18977. --- changes/bug18977 | 4 ++++ src/common/compat.c | 3 +++ src/common/util.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/changes/bug18977 b/changes/bug18977 new file mode 100644 index 0000000..3f46b09 --- /dev/null +++ b/changes/bug18977 @@ -0,0 +1,4 @@ + o Minor bugfixes (time handling): + - When correcting a corrupt 'struct tm' value, fill in the tm_wday + field. Otherwise, our unit tests crash on Windows. + Fixes bug 18977; bugfix on 0.2.2.25-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..90132fc 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2462,6 +2462,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 365; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; @@ -2479,6 +2480,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 1; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@ -2492,6 +2494,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 365; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; diff --git a/src/common/util.c b/src/common/util.c index 5eb0f9a..31dc2a4 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1460,6 +1460,7 @@ parse_iso_time(const char *cp, time_t *t) st_tm.tm_hour = hour; st_tm.tm_min = minute; st_tm.tm_sec = second; + st_tm.tm_wday = 0; /* Should be ignored. */ if (st_tm.tm_year < 70) { char *esc = esc_for_log(cp); @@ -1517,6 +1518,7 @@ parse_http_time(const char *date, struct tm *tm) tm->tm_hour = (int)tm_hour; tm->tm_min = (int)tm_min; tm->tm_sec = (int)tm_sec; + tm->tm_wday = 0; /* Leave this unset. */ month[3] = '\0'; /* Okay, now decode the month. */

1 0

[tor/release-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/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit e8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1 Merge: ce6f2d1 4165b1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 15:33:47 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+)

1 0

[tor/release-0.2.8] Add a comment to have_enough_path_info()
by nickm＠torproject.org 12 May '16

12 May '16

commit 0c41ae18329644828ff247b00a7f4e99e3f38312 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon May 9 14:26:13 2016 -0400 Add a comment to have_enough_path_info() Comment only change --- src/or/circuituse.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea..fa6c666 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1674,7 +1674,11 @@ circuit_launch(uint8_t purpose, int flags) return circuit_launch_by_extend_info(purpose, NULL, flags); } -/* DOCDOC */ +/* Do we have enough descriptors to build paths? + * If need_exit is true, return 1 if we can build exit paths. + * (We need at least one Exit in the consensus to build exit paths.) + * If need_exit is false, return 0 if we can build internal paths. + */ static int have_enough_path_info(int need_exit) {

1 0

[tor/release-0.2.8] Allow directories in small networks to bootstrap
by nickm＠torproject.org 12 May '16

12 May '16

commit c2817774c28a40f76890b68775097596d14e035e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon May 9 14:29:07 2016 -0400 Allow directories in small networks to bootstrap Skip DirPort checks when the consensus has no exits. Resolves #19003, bugfix on #18050 in 0.2.8.1-alpha. --- changes/bug19003 | 5 +++++ src/or/router.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug19003 b/changes/bug19003 new file mode 100644 index 0000000..d9ef23d --- /dev/null +++ b/changes/bug19003 @@ -0,0 +1,5 @@ + o Minor bugfixes (small networks): + - Allow directories in small networks to bootstrap by + skipping DirPort checks when the consensus has no exits. + Resolves #19003, bugfix on #18050 in 0.2.8.1-alpha. + Patch by teor. diff --git a/src/or/router.c b/src/or/router.c index 68bcf13..dd84210 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1551,6 +1551,8 @@ proxy_mode(const or_options_t *options) * and * - We believe both our ORPort and DirPort (if present) are reachable from * the outside; or + * - We believe both our ORPort is reachable from the outside, and we can't + * check our DirPort because the consensus has no exits; or * - We are an authoritative directory server. */ static int @@ -1568,7 +1570,13 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; + /* If there are no exits in the consensus, but have enough descriptors to + * build internal paths, we can't possibly verify our DirPort. + * This only happens in small networks without exits. */ + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) + return check_whether_orport_reachable(); + /* If there are exits in the consensus, use an exit to check our DirPort. */ return check_whether_orport_reachable() && check_whether_dirport_reachable(); }

1 0

[tor/release-0.2.8] Merge branch 'bug19008_027' into maint-0.2.7
by nickm＠torproject.org 12 May '16

12 May '16

commit 61c0bae4f20556cf155562582ea00a6a147252d6 Merge: 7fe80c2 85c698d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 18:14:27 2016 -0400 Merge branch 'bug19008_027' into maint-0.2.7 Makefile.am | 2 +- changes/bug19008 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Add "-c 1" to ping6 in test-network-all
by nickm＠torproject.org 12 May '16

12 May '16

commit 85c698da72ef3737e7c209732b2a9b892c9273fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 18:12:59 2016 -0400 Add "-c 1" to ping6 in test-network-all Fixes bug 19008. bugfix on 0.2.7.3-rc --- Makefile.am | 2 +- changes/bug19008 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index beea69d..6fd9405 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,7 @@ test-network: need-chutney-path all test-network-all: need-chutney-path all test-driver mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - if ping6 -q -o ::1 >/dev/null 2>&1; then \ + if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ else \ diff --git a/changes/bug19008 b/changes/bug19008 new file mode 100644 index 0000000..c51c98f --- /dev/null +++ b/changes/bug19008 @@ -0,0 +1,3 @@ + o Major bugfixes (testing): + - Fix a bug that would block 'make test-network-all' on systems + where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc.

1 0

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

12 May '16

commit 5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4 Merge: 55cf197 61c0bae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 18:14:44 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 Makefile.am | 2 +- changes/bug19008 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Switch between fallback and authority when auth cert fetch fails
by nickm＠torproject.org 12 May '16

12 May '16

commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 4 15:41:37 2016 +1000 Switch between fallback and authority when auth cert fetch fails --- changes/bug18816 | 2 ++ src/or/routerlist.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 index 7265f5a..0545512 100644 --- a/changes/bug18816 +++ b/changes/bug18816 @@ -1,4 +1,6 @@ o Minor bugfix (bootstrap): - Consistently use the consensus download schedule for authority certificates. + - When downloading authority certificates fails, switch from + using a fallback to using an authority. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 85e9e7d..3169343 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -912,11 +912,14 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fps) > 1) { + static int want_auth = 0; resource = smartlist_join_strings(fps, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); + want_auth ? DL_WANT_AUTHORITY + : DL_WANT_ANY_DIRSERVER); + /* on failure, swap between using fallbacks and authorities */ + want_auth = !want_auth; tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -958,11 +961,14 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fp_pairs) > 1) { + static int want_auth = 0; resource = smartlist_join_strings(fp_pairs, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); + want_auth ? DL_WANT_AUTHORITY + : DL_WANT_ANY_DIRSERVER); + /* on failure, swap between using fallbacks and authorities */ + want_auth = !want_auth; tor_free(resource); } /* else they were all pending */

1 0