July 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 4f854dbdc2f3ade1b6c0cb610907fe1ad085f9ca Merge: a159eaf45 3821081a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 09:01:45 2018 -0400 Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3 changes/bug26627 | 7 +++++++ src/or/hs_circuit.c | 20 ++++++++++++++------ src/or/hs_service.c | 29 ++++++++++++++++++++--------- src/or/hs_service.h | 5 +++-- src/test/test_hs_cell.c | 4 ++-- src/test/test_hs_intropoint.c | 4 ++-- src/test/test_hs_service.c | 2 +- 7 files changed, 49 insertions(+), 22 deletions(-)

1 0

[tor/release-0.3.4] Stop sending unsupported ed25519 link specifiers in v3 introduce cells
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit a99920c7d4ace4d87f6876ab3aaef79ee1aff509 Author: teor <teor2345(a)gmail.com> Date: Fri Jul 6 16:06:44 2018 +1000 Stop sending unsupported ed25519 link specifiers in v3 introduce cells Stop sending ed25519 link specifiers in v3 onion service introduce cells, when the rendezvous point doesn't support ed25519 link authentication. Fixes bug 26627; bugfix on 0.3.2.4-alpha. --- changes/bug26627 | 4 ++++ src/or/hs_circuit.c | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/changes/bug26627 b/changes/bug26627 new file mode 100644 index 000000000..a46038f72 --- /dev/null +++ b/changes/bug26627 @@ -0,0 +1,4 @@ + o Minor bugfixes (v3 onion services): + - Stop sending ed25519 link specifiers in v3 onion service introduce + cells, when the rendezvous point doesn't support ed25519 link + authentication. Fixes bug 26627; bugfix on 0.3.2.4-alpha. diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 3a674f622..0a9999a19 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -559,10 +559,14 @@ retry_service_rendezvous_point(const origin_circuit_t *circ) return; } -/* Add all possible link specifiers in node to lspecs. - * legacy ID is mandatory thus MUST be present in node. If the primary address - * is not IPv4, log a BUG() warning, and return an empty smartlist. - * Includes ed25519 id and IPv6 link specifiers if present in the node. */ +/* Add all possible link specifiers in node to lspecs: + * - legacy ID is mandatory thus MUST be present in node; + * - include ed25519 link specifier if present in the node, and the node + * supports ed25519 link authentication, even if its link versions are not + * compatible with us; + * - include IPv4 link specifier, if the primary address is not IPv4, log a + * BUG() warning, and return an empty smartlist; + * - include IPv6 link specifier if present in the node. */ static void get_lspecs_from_node(const node_t *node, smartlist_t *lspecs) { @@ -600,8 +604,12 @@ get_lspecs_from_node(const node_t *node, smartlist_t *lspecs) link_specifier_set_ls_len(ls, link_specifier_getlen_un_legacy_id(ls)); smartlist_add(lspecs, ls); - /* ed25519 ID is only included if the node has it. */ - if (!ed25519_public_key_is_zero(&node->ed25519_id)) { + /* ed25519 ID is only included if the node has it, and the node declares a + protocol version that supports ed25519 link authentication, even if that + link version is not compatible with us. (We are sending the ed25519 key + to another tor, which may support different link versions.) */ + if (!ed25519_public_key_is_zero(&node->ed25519_id) && + node_supports_ed25519_link_authentication(node, 0)) { ls = link_specifier_new(); link_specifier_set_ls_type(ls, LS_ED25519_ID); memcpy(link_specifier_getarray_un_ed25519_id(ls), &node->ed25519_id,

1 0

[tor/release-0.3.4] Stop putting unsupported ed25519 link auth in v3 onion service descs
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 3821081a550efc090bb6c583041e1b26a2db72b5 Author: teor <teor(a)torproject.org> Date: Tue Jul 24 18:22:41 2018 +1000 Stop putting unsupported ed25519 link auth in v3 onion service descs Stop putting ed25519 link specifiers in v3 onion service descriptors, when the intro point doesn't support ed25519 link authentication. Fixes bug 26627; bugfix on 0.3.2.4-alpha. --- changes/bug26627 | 3 +++ src/or/hs_service.c | 29 ++++++++++++++++++++--------- src/or/hs_service.h | 5 +++-- src/test/test_hs_cell.c | 4 ++-- src/test/test_hs_intropoint.c | 4 ++-- src/test/test_hs_service.c | 2 +- 6 files changed, 31 insertions(+), 16 deletions(-) diff --git a/changes/bug26627 b/changes/bug26627 index a46038f72..d28bd05d5 100644 --- a/changes/bug26627 +++ b/changes/bug26627 @@ -2,3 +2,6 @@ - Stop sending ed25519 link specifiers in v3 onion service introduce cells, when the rendezvous point doesn't support ed25519 link authentication. Fixes bug 26627; bugfix on 0.3.2.4-alpha. + - Stop putting ed25519 link specifiers in v3 onion service descriptors, + when the intro point doesn't support ed25519 link authentication. + Fixes bug 26627; bugfix on 0.3.2.4-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index c31f8bbf6..21daaaa24 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -376,17 +376,21 @@ service_intro_point_free_void(void *obj) } /* Return a newly allocated service intro point and fully initialized from the - * given extend_info_t ei if non NULL. If is_legacy is true, we also generate - * the legacy key. On error, NULL is returned. + * given extend_info_t ei if non NULL. + * If is_legacy is true, we also generate the legacy key. + * If supports_ed25519_link_handshake_any is true, we add the relay's ed25519 + * key to the link specifiers. * * If ei is NULL, returns a hs_service_intro_point_t with an empty link * specifier list and no onion key. (This is used for testing.) + * On any other error, NULL is returned. * * ei must be an extend_info_t containing an IPv4 address. (We will add supoort * for IPv6 in a later release.) When calling extend_info_from_node(), pass * 0 in for_direct_connection to make sure ei always has an IPv4 address. */ STATIC hs_service_intro_point_t * -service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) +service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy, + unsigned int supports_ed25519_link_handshake_any) { hs_desc_link_specifier_t *ls; hs_service_intro_point_t *ip; @@ -453,10 +457,13 @@ service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) } smartlist_add(ip->base.link_specifiers, ls); - /* ed25519 identity key is optional for intro points */ - ls = hs_desc_link_specifier_new(ei, LS_ED25519_ID); - if (ls) { - smartlist_add(ip->base.link_specifiers, ls); + /* ed25519 identity key is optional for intro points. If the node supports + * ed25519 link authentication, we include it. */ + if (supports_ed25519_link_handshake_any) { + ls = hs_desc_link_specifier_new(ei, LS_ED25519_ID); + if (ls) { + smartlist_add(ip->base.link_specifiers, ls); + } } /* IPv6 is not supported in this release. */ @@ -1586,8 +1593,12 @@ pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes) tor_assert_nonfatal(!ed25519_public_key_is_zero(&info->ed_identity)); } - /* Create our objects and populate them with the node information. */ - ip = service_intro_point_new(info, !node_supports_ed25519_hs_intro(node)); + /* Create our objects and populate them with the node information. + * We don't care if the intro's link auth is compatible with us, because + * we are sending the ed25519 key to a remote client via the descriptor. */ + ip = service_intro_point_new(info, !node_supports_ed25519_hs_intro(node), + node_supports_ed25519_link_authentication(node, + 0)); if (ip == NULL) { goto err; } diff --git a/src/or/hs_service.h b/src/or/hs_service.h index d163eeef2..f3cd49e07 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -307,8 +307,9 @@ STATIC void remove_service(hs_service_ht *map, hs_service_t *service); STATIC int register_service(hs_service_ht *map, hs_service_t *service); /* Service introduction point functions. */ STATIC hs_service_intro_point_t *service_intro_point_new( - const extend_info_t *ei, - unsigned int is_legacy); + const extend_info_t *ei, + unsigned int is_legacy, + unsigned int supports_ed25519_link_handshake_any); STATIC void service_intro_point_free_(hs_service_intro_point_t *ip); #define service_intro_point_free(ip) \ FREE_AND_NULL(hs_service_intro_point_t, \ diff --git a/src/test/test_hs_cell.c b/src/test/test_hs_cell.c index 1b3c788a6..aed28d3bd 100644 --- a/src/test/test_hs_cell.c +++ b/src/test/test_hs_cell.c @@ -38,7 +38,7 @@ test_gen_establish_intro_cell(void *arg) attempt to parse it. */ { /* We only need the auth key pair here. */ - hs_service_intro_point_t *ip = service_intro_point_new(NULL, 0); + hs_service_intro_point_t *ip = service_intro_point_new(NULL, 0, 0); /* Auth key pair is generated in the constructor so we are all set for * using this IP object. */ ret = hs_cell_build_establish_intro(circ_nonce, ip, buf); @@ -106,7 +106,7 @@ test_gen_establish_intro_cell_bad(void *arg) ed25519_sign_prefixed() function and make it fail. */ cell = trn_cell_establish_intro_new(); tt_assert(cell); - ip = service_intro_point_new(NULL, 0); + ip = service_intro_point_new(NULL, 0, 0); cell_len = hs_cell_build_establish_intro(circ_nonce, ip, NULL); service_intro_point_free(ip); expect_log_msg_containing("Unable to make signature for " diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 5b75e3893..ec4dcb470 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -49,7 +49,7 @@ new_establish_intro_cell(const char *circ_nonce, /* Auth key pair is generated in the constructor so we are all set for * using this IP object. */ - ip = service_intro_point_new(NULL, 0); + ip = service_intro_point_new(NULL, 0, 0); tt_assert(ip); cell_len = hs_cell_build_establish_intro(circ_nonce, ip, buf); tt_i64_op(cell_len, OP_GT, 0); @@ -75,7 +75,7 @@ new_establish_intro_encoded_cell(const char *circ_nonce, uint8_t *cell_out) /* Auth key pair is generated in the constructor so we are all set for * using this IP object. */ - ip = service_intro_point_new(NULL, 0); + ip = service_intro_point_new(NULL, 0, 0); tt_assert(ip); cell_len = hs_cell_build_establish_intro(circ_nonce, ip, cell_out); tt_i64_op(cell_len, OP_GT, 0); diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 2e5280610..c1e9f3ced 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -241,7 +241,7 @@ static hs_service_intro_point_t * helper_create_service_ip(void) { hs_desc_link_specifier_t *ls; - hs_service_intro_point_t *ip = service_intro_point_new(NULL, 0); + hs_service_intro_point_t *ip = service_intro_point_new(NULL, 0, 0); tor_assert(ip); /* Add a first unused link specifier. */ ls = tor_malloc_zero(sizeof(*ls));

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 56fd0249f288998a81d00456416e2e42dea1e246 Merge: 1a57de97a 21babc8d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 09:01:59 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26627 | 7 +++++++ src/or/hs_circuit.c | 20 ++++++++++++++------ src/or/hs_service.c | 29 ++++++++++++++++++++--------- src/or/hs_service.h | 5 +++-- src/test/test_hs_cell.c | 4 ++-- src/test/test_hs_intropoint.c | 4 ++-- src/test/test_hs_service.c | 2 +- 7 files changed, 49 insertions(+), 22 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 21babc8d3f138be94336cad40168390ed9509793 Merge: 7d66ec0fe 4f854dbdc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 09:01:59 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26627 | 7 +++++++ src/or/hs_circuit.c | 20 ++++++++++++++------ src/or/hs_service.c | 29 ++++++++++++++++++++--------- src/or/hs_service.h | 5 +++-- src/test/test_hs_cell.c | 4 ++-- src/test/test_hs_intropoint.c | 4 ++-- src/test/test_hs_service.c | 2 +- 7 files changed, 49 insertions(+), 22 deletions(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 4f854dbdc2f3ade1b6c0cb610907fe1ad085f9ca Merge: a159eaf45 3821081a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 09:01:45 2018 -0400 Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3 changes/bug26627 | 7 +++++++ src/or/hs_circuit.c | 20 ++++++++++++++------ src/or/hs_service.c | 29 ++++++++++++++++++++--------- src/or/hs_service.h | 5 +++-- src/test/test_hs_cell.c | 4 ++-- src/test/test_hs_intropoint.c | 4 ++-- src/test/test_hs_service.c | 2 +- 7 files changed, 49 insertions(+), 22 deletions(-)

1 0

[tor/master] New manpage for tor-print-ed-signing-cert
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 121f3dc27ce16d1be6676fd67aff8dc203acf8b7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jun 22 13:34:40 2018 +0300 New manpage for tor-print-ed-signing-cert --- doc/include.am | 6 +++++- doc/tor-print-ed-signing-cert.1.txt | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/doc/include.am b/doc/include.am index e429d05a4..3e3b8e612 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,7 +12,7 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify +all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify doc/tor-print-ed-signing-cert if USE_ASCIIDOC nodist_man1_MANS = $(all_mans:=.1) @@ -64,11 +64,13 @@ doc/tor.1.in: doc/tor.1.txt doc/torify.1.in: doc/torify.1.txt doc/tor-gencert.1.in: doc/tor-gencert.1.txt doc/tor-resolve.1.in: doc/tor-resolve.1.txt +doc/tor-print-ed-signing-cert.1.in: doc/tor-print-ed-signing-cert.1.txt doc/tor.html.in: doc/tor.1.txt doc/torify.html.in: doc/torify.1.txt doc/tor-gencert.html.in: doc/tor-gencert.1.txt doc/tor-resolve.html.in: doc/tor-resolve.1.txt +doc/tor-print-ed-signing-cert.html.in: doc/tor-print-ed-signing-cert.1.txt # use config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. @@ -82,11 +84,13 @@ $(asciidoc_product) : doc/tor.html: doc/tor.html.in doc/tor-gencert.html: doc/tor-gencert.html.in doc/tor-resolve.html: doc/tor-resolve.html.in +doc/tor-print-ed-signing-cert.html: doc/tor-print-ed-signing-cert.html.in doc/torify.html: doc/torify.html.in doc/tor.1: doc/tor.1.in doc/tor-gencert.1: doc/tor-gencert.1.in doc/tor-resolve.1: doc/tor-resolve.1.in +doc/tor-print-ed-signing-cert.1: doc/tor-print-ed-signing-cert.1.in doc/torify.1: doc/torify.1.in CLEANFILES+= $(asciidoc_product) diff --git a/doc/tor-print-ed-signing-cert.1.txt b/doc/tor-print-ed-signing-cert.1.txt new file mode 100644 index 000000000..1a3109df9 --- /dev/null +++ b/doc/tor-print-ed-signing-cert.1.txt @@ -0,0 +1,32 @@ +// Copyright (c) The Tor Project, Inc. +// See LICENSE for licensing information +// This is an asciidoc file used to generate the manpage/html reference. +// Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html +:man source: Tor +:man manual: Tor Manual +tor-print-ed-signing-cert(1) +============================ +Tor Project, Inc. + +NAME +---- +tor-print-ed-signing-cert - print expiration date of ed25519 signing certificate + +SYNOPSIS +-------- +**tor-print-ed-signing-cert** __<path to ed25519_signing_cert file>__ + +DESCRIPTION +----------- +**tor-print-ed-signing-cert** is utility program for Tor relay operators to +check expiration date of ed25519 signing certificate. + +SEE ALSO +-------- +**tor**(1) + + +https://spec.torproject.org/cert-spec + +AUTHORS +------- +Roger Dingledine <arma(a)mit.edu>, Nick Mathewson <nickm(a)alum.mit.edu>.

1 0

[tor/master] Merge remote-tracking branch 'rl1987/feature19506_3'
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit ff593ae8781941bfe035d43ded5c18eb772ac486 Merge: 13393b2d9 abc0a72fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:55:57 2018 -0400 Merge remote-tracking branch 'rl1987/feature19506_3' .gitignore | 7 ++++ changes/feature19506 | 3 ++ doc/include.am | 6 +++- doc/tor-print-ed-signing-cert.1.txt | 32 +++++++++++++++++ src/tools/Makefile.nmake | 5 ++- src/tools/include.am | 11 +++++- src/tools/tor-print-ed-signing-cert.c | 65 +++++++++++++++++++++++++++++++++++ 7 files changed, 126 insertions(+), 3 deletions(-)

1 0

[tor/master] Update .gitignore
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit abc0a72fd16c59ef6b834e80caa36184267fd494 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jul 8 14:56:16 2018 +0200 Update .gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 80c039a68..1cd99dfd3 100644 --- a/.gitignore +++ b/.gitignore @@ -116,6 +116,11 @@ uptime-*.json /doc/torify.html /doc/torify.html.in /doc/torify.1.xml +/doc/tor-print-ed-signing-cert.1 +/doc/tor-print-ed-signing-cert.1.in +/doc/tor-print-ed-signing-cert.html +/doc/tor-print-ed-signing-cert.html.in +/doc/tor-print-ed-signing-cert.1.xml # /doc/spec/ /doc/spec/Makefile @@ -258,6 +263,8 @@ uptime-*.json /src/tools/tor-resolve /src/tools/tor-cov-resolve /src/tools/tor-gencert +/src/tools/tor-print-ed-signing-cert +/src/tools/tor-print-ed-signing-cert.exe /src/tools/tor-cov-gencert /src/tools/tor-checkkey.exe /src/tools/tor-resolve.exe

1 0

[tor/master] Add changes file
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 0bd2f2edd9f7e01bfcf7d78c838884f5e4d17417 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Jun 13 13:36:08 2018 +0300 Add changes file --- changes/feature19506 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/feature19506 b/changes/feature19506 new file mode 100644 index 000000000..83ba9e245 --- /dev/null +++ b/changes/feature19506 @@ -0,0 +1,3 @@ + o Minor features (admin tools): + - Add new tool that prints expiration date of signing cert + in ed25519_signing_cert. Resolves issue 19506.

1 0