- tor-commits - lists.torproject.org

[tor/maint-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/maint-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/maint-0.2.8] refactor the #19003 patches
by nickm＠torproject.org 12 May '16

12 May '16

commit b8b5bccfd9f350cd796a8bcd6b79b9d303a79e11 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 13:03:49 2016 -0400 refactor the #19003 patches fix the logic in one of the comments --- src/or/circuituse.c | 2 +- src/or/router.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fa6c666..a4b5801 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1677,7 +1677,7 @@ circuit_launch(uint8_t purpose, int flags) /* 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. + * If need_exit is false, return 1 if we can build internal paths. */ static int have_enough_path_info(int need_exit) diff --git a/src/or/router.c b/src/or/router.c index dd84210..3f94703 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1549,9 +1549,9 @@ proxy_mode(const or_options_t *options) * and * - We have ORPort set * and - * - We believe both our ORPort and DirPort (if present) are reachable from + * - We believe 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 + * - We believe 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. */ @@ -1570,14 +1570,15 @@ 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(); + if (!check_whether_orport_reachable()) + return 0; + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { + /* All set: there are no exits in the consensus (maybe this is a tiny + * test network), so we can't check our DirPort reachability. */ + return 1; + } else { + return check_whether_dirport_reachable(); + } } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

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

12 May '16

commit ce6f2d1c4da5125cdd4a69fcc4cd45f7c3d6ca8d Merge: d00d3f1 b8b5bcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 11:09:33 2016 -0400 Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8 changes/bug19003 | 5 +++++ src/or/circuituse.c | 6 +++++- src/or/router.c | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)

1 0

[tor/master] Use tor_queue.h, not sys/queue.h, in timeouts.[ch].
by nickm＠torproject.org 12 May '16

12 May '16

commit f936f186b2a22c70a50021e2e7e0adf1ff131834 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 10:10:59 2016 -0400 Use tor_queue.h, not sys/queue.h, in timeouts.[ch]. Closes 19041. --- src/ext/timeouts/timeout.c | 68 +++++++++++++++++++++++----------------------- src/ext/timeouts/timeout.h | 4 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c index f528576..bd463a7 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -38,7 +38,7 @@ #include <errno.h> /* errno */ -#include <sys/queue.h> /* TAILQ(3) */ +#include "tor_queue.h" /* TAILQ(3) */ #include "timeout.h" @@ -80,21 +80,21 @@ #define MAX(a, b) (((a) > (b))? (a) : (b)) #endif -#if !defined TAILQ_CONCAT -#define TAILQ_CONCAT(head1, head2, field) do { \ - if (!TAILQ_EMPTY(head2)) { \ +#if !defined TOR_TAILQ_CONCAT +#define TOR_TAILQ_CONCAT(head1, head2, field) do { \ + if (!TOR_TAILQ_EMPTY(head2)) { \ *(head1)->tqh_last = (head2)->tqh_first; \ (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ (head1)->tqh_last = (head2)->tqh_last; \ - TAILQ_INIT((head2)); \ + TOR_TAILQ_INIT((head2)); \ } \ } while (0) #endif -#if !defined TAILQ_FOREACH_SAFE -#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = TAILQ_FIRST(head); \ - (var) && ((tvar) = TAILQ_NEXT(var, field), 1); \ +#if !defined TOR_TAILQ_FOREACH_SAFE +#define TOR_TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TOR_TAILQ_FIRST(head); \ + (var) && ((tvar) = TOR_TAILQ_NEXT(var, field), 1); \ (var) = (tvar)) #endif @@ -210,7 +210,7 @@ static inline wheel_t rotr(const wheel_t v, int c) { * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -TAILQ_HEAD(timeout_list, timeout); +TOR_TAILQ_HEAD(timeout_list, timeout); struct timeouts { struct timeout_list wheel[WHEEL_NUM][WHEEL_LEN], expired; @@ -227,11 +227,11 @@ static struct timeouts *timeouts_init(struct timeouts *T, timeout_t hz) { for (i = 0; i < countof(T->wheel); i++) { for (j = 0; j < countof(T->wheel[i]); j++) { - TAILQ_INIT(&T->wheel[i][j]); + TOR_TAILQ_INIT(&T->wheel[i][j]); } } - TAILQ_INIT(&T->expired); + TOR_TAILQ_INIT(&T->expired); for (i = 0; i < countof(T->pending); i++) { T->pending[i] = 0; @@ -261,17 +261,17 @@ static void timeouts_reset(struct timeouts *T) { struct timeout *to; unsigned i, j; - TAILQ_INIT(&reset); + TOR_TAILQ_INIT(&reset); for (i = 0; i < countof(T->wheel); i++) { for (j = 0; j < countof(T->wheel[i]); j++) { - TAILQ_CONCAT(&reset, &T->wheel[i][j], tqe); + TOR_TAILQ_CONCAT(&reset, &T->wheel[i][j], tqe); } } - TAILQ_CONCAT(&reset, &T->expired, tqe); + TOR_TAILQ_CONCAT(&reset, &T->expired, tqe); - TAILQ_FOREACH(to, &reset, tqe) { + TOR_TAILQ_FOREACH(to, &reset, tqe) { to->pending = NULL; TO_SET_TIMEOUTS(to, NULL); } @@ -296,9 +296,9 @@ TIMEOUT_PUBLIC timeout_t timeouts_hz(struct timeouts *T) { TIMEOUT_PUBLIC void timeouts_del(struct timeouts *T, struct timeout *to) { if (to->pending) { - TAILQ_REMOVE(to->pending, to, tqe); + TOR_TAILQ_REMOVE(to->pending, to, tqe); - if (to->pending != &T->expired && TAILQ_EMPTY(to->pending)) { + if (to->pending != &T->expired && TOR_TAILQ_EMPTY(to->pending)) { ptrdiff_t index = to->pending - &T->wheel[0][0]; int wheel = (int) (index / WHEEL_LEN); int slot = index % WHEEL_LEN; @@ -350,12 +350,12 @@ static void timeouts_sched(struct timeouts *T, struct timeout *to, timeout_t exp slot = timeout_slot(wheel, to->expires); to->pending = &T->wheel[wheel][slot]; - TAILQ_INSERT_TAIL(to->pending, to, tqe); + TOR_TAILQ_INSERT_TAIL(to->pending, to, tqe); T->pending[wheel] |= WHEEL_C(1) << slot; } else { to->pending = &T->expired; - TAILQ_INSERT_TAIL(to->pending, to, tqe); + TOR_TAILQ_INSERT_TAIL(to->pending, to, tqe); } } /* timeouts_sched() */ @@ -397,7 +397,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) { struct timeout_list todo; int wheel; - TAILQ_INIT(&todo); + TOR_TAILQ_INIT(&todo); /* * There's no avoiding looping over every wheel. It's best to keep @@ -442,7 +442,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) { while (pending & T->pending[wheel]) { /* ctz input cannot be zero: loop condition. */ int slot = ctz(pending & T->pending[wheel]); - TAILQ_CONCAT(&todo, &T->wheel[wheel][slot], tqe); + TOR_TAILQ_CONCAT(&todo, &T->wheel[wheel][slot], tqe); T->pending[wheel] &= ~(UINT64_C(1) << slot); } @@ -455,10 +455,10 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) { T->curtime = curtime; - while (!TAILQ_EMPTY(&todo)) { - struct timeout *to = TAILQ_FIRST(&todo); + while (!TOR_TAILQ_EMPTY(&todo)) { + struct timeout *to = TOR_TAILQ_FIRST(&todo); - TAILQ_REMOVE(&todo, to, tqe); + TOR_TAILQ_REMOVE(&todo, to, tqe); to->pending = NULL; timeouts_sched(T, to, to->expires); @@ -489,7 +489,7 @@ TIMEOUT_PUBLIC bool timeouts_pending(struct timeouts *T) { TIMEOUT_PUBLIC bool timeouts_expired(struct timeouts *T) { - return !TAILQ_EMPTY(&T->expired); + return !TOR_TAILQ_EMPTY(&T->expired); } /* timeouts_expired() */ @@ -544,7 +544,7 @@ static timeout_t timeouts_int(struct timeouts *T) { * events. */ TIMEOUT_PUBLIC timeout_t timeouts_timeout(struct timeouts *T) { - if (!TAILQ_EMPTY(&T->expired)) + if (!TOR_TAILQ_EMPTY(&T->expired)) return 0; return timeouts_int(T); @@ -552,10 +552,10 @@ TIMEOUT_PUBLIC timeout_t timeouts_timeout(struct timeouts *T) { TIMEOUT_PUBLIC struct timeout *timeouts_get(struct timeouts *T) { - if (!TAILQ_EMPTY(&T->expired)) { - struct timeout *to = TAILQ_FIRST(&T->expired); + if (!TOR_TAILQ_EMPTY(&T->expired)) { + struct timeout *to = TOR_TAILQ_FIRST(&T->expired); - TAILQ_REMOVE(&T->expired, to, tqe); + TOR_TAILQ_REMOVE(&T->expired, to, tqe); to->pending = NULL; TO_SET_TIMEOUTS(to, NULL); @@ -581,7 +581,7 @@ static struct timeout *timeouts_min(struct timeouts *T) { for (i = 0; i < countof(T->wheel); i++) { for (j = 0; j < countof(T->wheel[i]); j++) { - TAILQ_FOREACH(to, &T->wheel[i][j], tqe) { + TOR_TAILQ_FOREACH(to, &T->wheel[i][j], tqe) { if (!min || to->expires < min->expires) min = to; } @@ -623,7 +623,7 @@ TIMEOUT_PUBLIC bool timeouts_check(struct timeouts *T, FILE *fp) { } else { timeout = timeouts_timeout(T); - if (!TAILQ_EMPTY(&T->expired)) + if (!TOR_TAILQ_EMPTY(&T->expired)) check(timeout == 0, "wrong soft timeout (soft:%" TIMEOUT_PRIu " != hard:%" TIMEOUT_PRIu ")\n", timeout, TIMEOUT_C(0)); else check(timeout == ~TIMEOUT_C(0), "wrong soft timeout (soft:%" TIMEOUT_PRIu " != hard:%" TIMEOUT_PRIu ")\n", timeout, ~TIMEOUT_C(0)); @@ -665,7 +665,7 @@ TIMEOUT_PUBLIC struct timeout *timeouts_next(struct timeouts *T, struct timeouts YIELD(to); } } else { - TAILQ_FOREACH_SAFE(to, &T->expired, tqe, it->to) { + TOR_TAILQ_FOREACH_SAFE(to, &T->expired, tqe, it->to) { YIELD(to); } } @@ -674,7 +674,7 @@ TIMEOUT_PUBLIC struct timeout *timeouts_next(struct timeouts *T, struct timeouts if (it->flags & TIMEOUTS_PENDING) { for (it->i = 0; it->i < countof(T->wheel); it->i++) { for (it->j = 0; it->j < countof(T->wheel[it->i]); it->j++) { - TAILQ_FOREACH_SAFE(to, &T->wheel[it->i][it->j], tqe, it->to) { + TOR_TAILQ_FOREACH_SAFE(to, &T->wheel[it->i][it->j], tqe, it->to) { YIELD(to); } } diff --git a/src/ext/timeouts/timeout.h b/src/ext/timeouts/timeout.h index 3b08f19..b35874e 100644 --- a/src/ext/timeouts/timeout.h +++ b/src/ext/timeouts/timeout.h @@ -31,7 +31,7 @@ #include <inttypes.h> /* PRIu64 PRIx64 PRIX64 uint64_t */ -#include <sys/queue.h> /* TAILQ(3) */ +#include "tor_queue.h" /* TAILQ(3) */ /* @@ -121,7 +121,7 @@ struct timeout { struct timeout_list *pending; /* timeout list if pending on wheel or expiry queue */ - TAILQ_ENTRY(timeout) tqe; + TOR_TAILQ_ENTRY(timeout) tqe; /* entry member for struct timeout_list lists */ #ifndef TIMEOUT_DISABLE_CALLBACKS

1 0

[tor/master] 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/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