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

[tor/master] Correctly assign HSDir flags based on protocol list
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 440eaa9b22573cdb0d38bf5c13200cc1077a453f Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 3 16:08:17 2017 +0300 Correctly assign HSDir flags based on protocol list In Nick's words: "We want to always return false if the platform is a Tor version, and it is not as new as 0.3.0.8 -- but if the platform is not a Tor version, or if the version is as new as 0.3.0.8, then we want to obey the protocol list. That way, other implementations of our protocol won't have to claim any particular Tor version, and future versions of Tor will have the freedom to drop this protocol in the distant future." --- src/or/nodelist.c | 9 +++++++-- src/or/routerparse.c | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index abbe15ecc..e900b5145 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -800,9 +800,14 @@ node_supports_v3_hsdir(const node_t *node) if (node->ri->protocol_list == NULL) { return 0; } + /* Bug #22447 forces us to filter on tor version: + * If platform is a Tor version, and older than 0.3.0.8, return False. + * Else, obey the protocol list. */ if (node->ri->platform) { - /* Bug #22447 forces us to filter on this version. */ - return tor_version_as_new_as(node->ri->platform, "0.3.0.8"); + if (!strcmpstart(node->ri->platform, "Tor ") && + !tor_version_as_new_as(node->ri->platform, "0.3.0.8")) { + return 0; + } } return protocol_list_supports_protocol(node->ri->protocol_list, PRT_HSDIR, PROTOVER_HSDIR_V3); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ec63aef4d..db42a44ee 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2706,7 +2706,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->supports_ed25519_hs_intro = protocol_list_supports_protocol(tok->args[0], PRT_HSINTRO, 4); rs->supports_v3_hsdir = - protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, 2); + protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, + PROTOVER_HSDIR_V3); } if ((tok = find_opt_by_keyword(tokens, K_V))) { tor_assert(tok->n_args == 1); @@ -2720,8 +2721,9 @@ routerstatus_parse_entry_from_string(memarea_t *area, } if (!strcmpstart(tok->args[0], "Tor ") && found_protocol_list) { /* Bug #22447 forces us to filter on this version. */ - rs->supports_v3_hsdir = - tor_version_as_new_as(tok->args[0], "0.3.0.8"); + if (!tor_version_as_new_as(tok->args[0], "0.3.0.8")) { + rs->supports_v3_hsdir = 0; + } } if (vote_rs) { vote_rs->version = tor_strdup(tok->args[0]);

1 0

[tor/master] Don't set HSDir index if we don't have a live consensus.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit b89d2fa1db2379bffd2e2b4c851c3facc57b6ed8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 4 12:21:14 2017 +0300 Don't set HSDir index if we don't have a live consensus. We also had to alter the SRV functions to take a consensus as optional input, since we might be setting our HSDir index using a consensus that is currently being processed and won't be returned by the networkstatus_get_live_consensus() function. This change has two results: a) It makes sure we are using a fresh consensus with the right SRV value when we are calculating the HSDir hash ring. b) It ensures that we will not use the sr_get_current/previous() functions when we don't have a consensus which would have falsely triggered the disaster SRV logic. --- src/or/hs_common.c | 11 ++++++----- src/or/hs_common.h | 6 ++++-- src/or/networkstatus.c | 15 +++++++++++---- src/or/networkstatus.h | 1 + src/or/nodelist.c | 13 +++++++++---- src/or/shared_random.c | 38 ++++++++++++++++++++++++++++++-------- src/or/shared_random.h | 4 ++-- 7 files changed, 63 insertions(+), 25 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 570c1132c..2894d0a28 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1058,12 +1058,13 @@ hs_build_hsdir_index(const ed25519_public_key_t *identity_pk, /* Return a newly allocated buffer containing the current shared random value * or if not present, a disaster value is computed using the given time period - * number. This function can't fail. */ + * number. If a consensus is provided in ns, use it to get the SRV + * value. This function can't fail. */ uint8_t * -hs_get_current_srv(uint64_t time_period_num) +hs_get_current_srv(uint64_t time_period_num, const networkstatus_t *ns) { uint8_t *sr_value = tor_malloc_zero(DIGEST256_LEN); - const sr_srv_t *current_srv = sr_get_current(); + const sr_srv_t *current_srv = sr_get_current(ns); if (current_srv) { memcpy(sr_value, current_srv->value, sizeof(current_srv->value)); @@ -1078,10 +1079,10 @@ hs_get_current_srv(uint64_t time_period_num) * value or if not present, a disaster value is computed using the given time * period number. This function can't fail. */ uint8_t * -hs_get_previous_srv(uint64_t time_period_num) +hs_get_previous_srv(uint64_t time_period_num, const networkstatus_t *ns) { uint8_t *sr_value = tor_malloc_zero(DIGEST256_LEN); - const sr_srv_t *previous_srv = sr_get_previous(); + const sr_srv_t *previous_srv = sr_get_previous(ns); if (previous_srv) { memcpy(sr_value, previous_srv->value, sizeof(previous_srv->value)); diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 268a69bb5..7e37f81e5 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -200,8 +200,10 @@ link_specifier_t *hs_link_specifier_dup(const link_specifier_t *lspec); MOCK_DECL(int, hs_overlap_mode_is_active, (const networkstatus_t *consensus, time_t now)); -uint8_t *hs_get_current_srv(uint64_t time_period_num); -uint8_t *hs_get_previous_srv(uint64_t time_period_num); +uint8_t *hs_get_current_srv(uint64_t time_period_num, + const networkstatus_t *ns); +uint8_t *hs_get_previous_srv(uint64_t time_period_num, + const networkstatus_t *ns); void hs_build_hsdir_index(const ed25519_public_key_t *identity_pk, const uint8_t *srv, uint64_t period_num, diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index aff36b4c0..82ceb8a9e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1393,14 +1393,21 @@ networkstatus_get_latest_consensus_by_flavor,(consensus_flavor_t f)) MOCK_IMPL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now)) { - if (networkstatus_get_latest_consensus() && - networkstatus_get_latest_consensus()->valid_after <= now && - now <= networkstatus_get_latest_consensus()->valid_until) - return networkstatus_get_latest_consensus(); + networkstatus_t *ns = networkstatus_get_latest_consensus(); + if (ns && networkstatus_is_live(ns, now)) + return ns; else return NULL; } +/** Given a consensus in ns, validate that it's currently live and + * unexpired. */ +int +networkstatus_is_live(const networkstatus_t *ns, time_t now) +{ + return (ns->valid_after <= now && now <= ns->valid_until); +} + /** Determine if consensus is valid or expired recently enough that * we can still use it. * diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index e774c4d26..f9320747d 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -81,6 +81,7 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void)); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, (consensus_flavor_t f)); MOCK_DECL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now)); +int networkstatus_is_live(const networkstatus_t *ns, time_t now); int networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, time_t now); int networkstatus_valid_until_is_reasonably_live(time_t valid_until, diff --git a/src/or/nodelist.c b/src/or/nodelist.c index e900b5145..0fcaea626 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -179,7 +179,7 @@ node_get_or_create(const char *identity_digest) static void node_set_hsdir_index(node_t *node, const networkstatus_t *ns) { - time_t now = time(NULL); + time_t now = approx_time(); const ed25519_public_key_t *node_identity_pk; uint8_t *next_hsdir_index_srv = NULL, *current_hsdir_index_srv = NULL; uint64_t next_time_period_num, current_time_period_num; @@ -187,6 +187,11 @@ node_set_hsdir_index(node_t *node, const networkstatus_t *ns) tor_assert(node); tor_assert(ns); + if (!networkstatus_is_live(ns, now)) { + log_info(LD_GENERAL, "Not setting hsdir index with a non-live consensus."); + goto done; + } + node_identity_pk = node_get_ed25519_id(node); if (node_identity_pk == NULL) { log_debug(LD_GENERAL, "ed25519 identity public key not found when " @@ -205,15 +210,15 @@ node_set_hsdir_index(node_t *node, const networkstatus_t *ns) * period, we have to use the current SRV and use the previous SRV for the * current time period. If the current or previous SRV can't be found, the * disaster one is returned. */ - next_hsdir_index_srv = hs_get_current_srv(next_time_period_num); + next_hsdir_index_srv = hs_get_current_srv(next_time_period_num, ns); /* The following can be confusing so again, in overlap mode, we use our * previous SRV for our _current_ hsdir index. */ - current_hsdir_index_srv = hs_get_previous_srv(current_time_period_num); + current_hsdir_index_srv = hs_get_previous_srv(current_time_period_num, ns); } else { /* If NOT in overlap mode, we only need to compute the current hsdir index * for the ongoing time period and thus the current SRV. If it can't be * found, the disaster one is returned. */ - current_hsdir_index_srv = hs_get_current_srv(current_time_period_num); + current_hsdir_index_srv = hs_get_current_srv(current_time_period_num, ns); } /* Build the current hsdir index. */ diff --git a/src/or/shared_random.c b/src/or/shared_random.c index ec2533dad..e4ee64139 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -1393,11 +1393,22 @@ sr_get_previous_for_control(void) /* Return current shared random value from the latest consensus. Caller can * NOT keep a reference to the returned pointer. Return NULL if none. */ const sr_srv_t * -sr_get_current(void) +sr_get_current(const networkstatus_t *ns) { - const networkstatus_t *c = networkstatus_get_latest_consensus(); - if (c) { - return c->sr_info.current_srv; + const networkstatus_t *consensus; + + /* Use provided ns else get a live one */ + if (ns) { + consensus = ns; + } else { + consensus = networkstatus_get_live_consensus(approx_time()); + } + /* Ideally we would never be asked for an SRV without a live consensus. Make + * sure this assumption is correct. */ + tor_assert_nonfatal(consensus); + + if (consensus) { + return consensus->sr_info.current_srv; } return NULL; } @@ -1405,11 +1416,22 @@ sr_get_current(void) /* Return previous shared random value from the latest consensus. Caller can * NOT keep a reference to the returned pointer. Return NULL if none. */ const sr_srv_t * -sr_get_previous(void) +sr_get_previous(const networkstatus_t *ns) { - const networkstatus_t *c = networkstatus_get_latest_consensus(); - if (c) { - return c->sr_info.previous_srv; + const networkstatus_t *consensus; + + /* Use provided ns else get a live one */ + if (ns) { + consensus = ns; + } else { + consensus = networkstatus_get_live_consensus(approx_time()); + } + /* Ideally we would never be asked for an SRV without a live consensus. Make + * sure this assumption is correct. */ + tor_assert_nonfatal(consensus); + + if (consensus) { + return consensus->sr_info.previous_srv; } return NULL; } diff --git a/src/or/shared_random.h b/src/or/shared_random.h index 58ea360df..76d5b9542 100644 --- a/src/or/shared_random.h +++ b/src/or/shared_random.h @@ -130,8 +130,8 @@ sr_commit_t *sr_generate_our_commit(time_t timestamp, char *sr_get_current_for_control(void); char *sr_get_previous_for_control(void); -const sr_srv_t *sr_get_current(void); -const sr_srv_t *sr_get_previous(void); +const sr_srv_t *sr_get_current(const networkstatus_t *ns); +const sr_srv_t *sr_get_previous(const networkstatus_t *ns); #ifdef SHARED_RANDOM_PRIVATE

1 0

[tor/master] Rename some free() functions that are actually clear().
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 3ce69a58ce908ea88443c1321a7e4378f059a897 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 3 15:51:24 2017 +0300 Rename some free() functions that are actually clear(). --- src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 +- src/or/hs_intropoint.c | 5 +++-- src/or/hs_intropoint.h | 2 +- src/or/hs_service.c | 14 +++++++------- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index e18e25b26..700d1b0cf 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -2490,7 +2490,7 @@ hs_desc_link_specifier_new(const extend_info_t *info, uint8_t type) /* From the given descriptor, remove and free every introduction point. */ void -hs_descriptor_free_intro_points(hs_descriptor_t *desc) +hs_descriptor_clear_intro_points(hs_descriptor_t *desc) { smartlist_t *ips; diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 2f1b0160e..d9c632b58 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -209,7 +209,7 @@ void hs_desc_encrypted_data_free(hs_desc_encrypted_data_t *desc); void hs_desc_link_specifier_free(hs_desc_link_specifier_t *ls); hs_desc_link_specifier_t *hs_desc_link_specifier_new( const extend_info_t *info, uint8_t type); -void hs_descriptor_free_intro_points(hs_descriptor_t *desc); +void hs_descriptor_clear_intro_points(hs_descriptor_t *desc); int hs_desc_encode_descriptor(const hs_descriptor_t *desc, const ed25519_keypair_t *signing_kp, diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 25c43b3ad..a0453841f 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -595,9 +595,10 @@ hs_intro_received_introduce1(or_circuit_t *circ, const uint8_t *request, return -1; } -/* Free the given intropoint object ip. */ +/* Clear memory allocated by the given intropoint object ip (but don't free the + * object itself). */ void -hs_intro_free_content(hs_intropoint_t *ip) +hs_intropoint_clear(hs_intropoint_t *ip) { if (ip == NULL) { return; diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h index 2e11de1b5..5c77f07ec 100644 --- a/src/or/hs_intropoint.h +++ b/src/or/hs_intropoint.h @@ -51,7 +51,7 @@ MOCK_DECL(int, hs_intro_send_intro_established_cell,(or_circuit_t *circ)); int hs_intro_circuit_is_suitable_for_establish_intro(const or_circuit_t *circ); hs_intropoint_t *hs_intro_new(void); -void hs_intro_free_content(hs_intropoint_t *ip); +void hs_intropoint_clear(hs_intropoint_t *ip); #ifdef HS_INTROPOINT_PRIVATE diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 430fb36a5..2a3217a5b 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -320,7 +320,7 @@ service_intro_point_free(hs_service_intro_point_t *ip) memwipe(&ip->enc_key_kp, 0, sizeof(ip->enc_key_kp)); crypto_pk_free(ip->legacy_key); replaycache_free(ip->replay_cache); - hs_intro_free_content(&ip->base); + hs_intropoint_clear(&ip->base); tor_free(ip); } @@ -1141,7 +1141,7 @@ build_desc_intro_points(const hs_service_t *service, /* Ease our life. */ encrypted = &desc->desc->encrypted_data; /* Cleanup intro points, we are about to set them from scratch. */ - hs_descriptor_free_intro_points(desc->desc); + hs_descriptor_clear_intro_points(desc->desc); DIGEST256MAP_FOREACH(desc->intro_points.map, key, const hs_service_intro_point_t *, ip) { @@ -2125,7 +2125,7 @@ get_rev_counter_for_service(ed25519_public_key_t *blinded_pubkey) /** Update the value of the revision counter for hs_desc and save it on our state file. */ static void -update_descriptor_revision_counter(hs_descriptor_t *hs_desc) +increment_descriptor_revision_counter(hs_descriptor_t *hs_desc) { /* Find stored rev counter if it exists */ uint64_t rev_counter = @@ -2212,7 +2212,7 @@ upload_descriptor_to_all(const hs_service_t *service, } /* Update the revision counter of this descriptor */ - update_descriptor_revision_counter(desc->desc); + increment_descriptor_revision_counter(desc->desc); smartlist_free(responsible_dirs); return; @@ -2517,8 +2517,8 @@ service_handle_introduce2(origin_circuit_t *circ, const uint8_t *payload, * information when originally tried to be uploaded. This is called when our * directory information has changed. */ static void -consider_hsdir_retry(const hs_service_t *service, - hs_service_descriptor_t *desc) +consider_hsdir_upload_retry(const hs_service_t *service, + hs_service_descriptor_t *desc) { smartlist_t *responsible_dirs = NULL; smartlist_t *still_missing_dirs = NULL; @@ -2772,7 +2772,7 @@ hs_service_dir_info_changed(void) /* This cleans up the descriptor missing hsdir information list if a * successful upload is made or if any of the directory aren't * responsible anymore for the service descriptor. */ - consider_hsdir_retry(service, desc); + consider_hsdir_upload_retry(service, desc); } FOR_EACH_DESCRIPTOR_END; } FOR_EACH_SERVICE_END; }

1 0

[tor/master] Make ed25519 id keys optional for IPs and RPs.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit f106af3c41dffdc8576c52399a61d34116b78f38 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 3 16:00:18 2017 +0300 Make ed25519 id keys optional for IPs and RPs. --- src/or/hs_circuit.c | 6 ++++-- src/or/hs_descriptor.c | 8 ++++++++ src/or/hs_service.c | 11 +++++++---- src/test/test_hs_service.c | 11 ++++++++++- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index c78ac6057..3d67f24cb 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -406,7 +406,7 @@ get_rp_extend_info(const smartlist_t *link_specifiers, } SMARTLIST_FOREACH_END(ls); /* IPv4, legacy ID and ed25519 are mandatory. */ - if (!have_v4 || !have_legacy_id || !have_ed25519_id) { + if (!have_v4 || !have_legacy_id) { goto done; } /* By default, we pick IPv4 but this might change to v6 if certain @@ -451,7 +451,9 @@ get_rp_extend_info(const smartlist_t *link_specifiers, } /* We do have everything for which we think we can connect successfully. */ - info = extend_info_new(NULL, legacy_id, &ed25519_pk, NULL, onion_key, + info = extend_info_new(NULL, legacy_id, + have_ed25519_id ? &ed25519_pk : NULL, + NULL, onion_key, addr, port); done: return info; diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 700d1b0cf..430e2f6f9 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -2471,9 +2471,17 @@ hs_desc_link_specifier_new(const extend_info_t *info, uint8_t type) ls->u.ap.port = info->port; break; case LS_LEGACY_ID: + /* Bug out if the identity digest is not set */ + if (BUG(tor_mem_is_zero(info->identity_digest, + sizeof(info->identity_digest)))) { + goto err; + } memcpy(ls->u.legacy_id, info->identity_digest, sizeof(ls->u.legacy_id)); break; case LS_ED25519_ID: + if (ed25519_public_key_is_zero(&info->ed_identity)) { + goto err; + } memcpy(ls->u.ed25519_id, info->ed_identity.pubkey, sizeof(ls->u.ed25519_id)); break; diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 86e7d40cb..a6f548d31 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -394,6 +394,7 @@ service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) goto err; } smartlist_add(ip->base.link_specifiers, ls); + ls = hs_desc_link_specifier_new(ei, LS_LEGACY_ID); /* It is impossible to have an extend info object without an identity * digest. */ @@ -401,11 +402,13 @@ service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) goto err; } smartlist_add(ip->base.link_specifiers, ls); + + /* ed25519 identity key is optional */ ls = hs_desc_link_specifier_new(ei, LS_ED25519_ID); - /* It is impossible to have an extend info object without an ed25519 - * identity key. */ - tor_assert(ls); - smartlist_add(ip->base.link_specifiers, ls); + if (ls) { + smartlist_add(ip->base.link_specifiers, ls); + } + /* IPv6 is optional. */ ls = hs_desc_link_specifier_new(ei, LS_IPV6); if (ls) { diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 2ad8393e8..4ee2cdac8 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1086,14 +1086,21 @@ test_build_update_descriptors(void *arg) ri.purpose = ROUTER_PURPOSE_GENERAL; /* Ugly yes but we never free the "ri" object so this just makes things * easier. */ - ri.protocol_list = (char *) "HSDir 1-2"; + ri.protocol_list = (char *) "HSDir=1-2 LinkAuth=3"; ret = curve25519_secret_key_generate(&curve25519_secret_key, 0); tt_int_op(ret, OP_EQ, 0); ri.onion_curve25519_pkey = tor_malloc_zero(sizeof(curve25519_public_key_t)); + ri.onion_pkey = crypto_pk_new(); curve25519_public_key_generate(ri.onion_curve25519_pkey, &curve25519_secret_key); memset(ri.cache_info.identity_digest, 'A', DIGEST_LEN); + /* Setup ed25519 identity */ + ed25519_keypair_t kp1; + ed25519_keypair_generate(&kp1, 0); + ri.cache_info.signing_key_cert = tor_malloc_zero(sizeof(tor_cert_t)); + tt_assert(ri.cache_info.signing_key_cert); + ed25519_pubkey_copy(&ri.cache_info.signing_key_cert->signing_key, &kp1.pubkey); nodelist_set_routerinfo(&ri, NULL); node = node_get_mutable_by_id(ri.cache_info.identity_digest); tt_assert(node); @@ -1104,6 +1111,8 @@ test_build_update_descriptors(void *arg) setup_full_capture_of_logs(LOG_INFO); update_all_descriptors(now); tor_free(node->ri->onion_curve25519_pkey); /* Avoid memleak. */ + tor_free(node->ri->cache_info.signing_key_cert); + crypto_pk_free(node->ri->onion_pkey); expect_log_msg_containing("just picked 1 intro points and wanted 3. It " "currently has 0 intro points. Launching " "ESTABLISH_INTRO circuit shortly.");

1 0

[tor/master] Make HidServRevCounter be a LINELIST as it should.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 706392e6b5967c8a7766a6b68b2428a17c1bbe8f Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 3 15:52:01 2017 +0300 Make HidServRevCounter be a LINELIST as it should. --- src/or/hs_service.c | 8 ++++---- src/or/or.h | 2 +- src/or/statefile.c | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 2a3217a5b..86e7d40cb 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -2015,8 +2015,8 @@ update_revision_counters_in_state(void) } FOR_EACH_SERVICE_END; /* Remove the old rev counters, and replace them with the new ones */ - config_free_lines(state->HidServRevCounters); - state->HidServRevCounters = lines; + config_free_lines(state->HidServRevCounter); + state->HidServRevCounter = lines; /* Set the state as dirty since we just edited it */ if (!get_options()->AvoidDiskWrites) { @@ -2101,13 +2101,13 @@ get_rev_counter_for_service(ed25519_public_key_t *blinded_pubkey) /* Set default value for rev counters (if not found) to 0 */ uint64_t final_rev_counter = 0; - for (line = state->HidServRevCounters ; line ; line = line->next) { + for (line = state->HidServRevCounter ; line ; line = line->next) { int service_found = 0; uint64_t rev_counter = 0; tor_assert(!strcmp(line->key, "HidServRevCounter")); - /* Scan all the HidServRevCounters lines till we find the line for this + /* Scan all the HidServRevCounter lines till we find the line for this service: */ rev_counter = check_state_line_for_service_rev_counter(line->value, blinded_pubkey, diff --git a/src/or/or.h b/src/or/or.h index d8aea3827..14dd4e0d6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4627,7 +4627,7 @@ typedef struct { config_line_t *TransportProxies; /** Cached revision counters for active hidden services on this host */ - config_line_t *HidServRevCounters; + config_line_t *HidServRevCounter; /** These fields hold information on the history of bandwidth usage for * servers. The "Ends" fields hold the time when we last updated the diff --git a/src/or/statefile.c b/src/or/statefile.c index 6b759960c..fc564ce14 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -85,8 +85,7 @@ static config_var_t state_vars_[] = { VAR("TransportProxy", LINELIST_S, TransportProxies, NULL), V(TransportProxies, LINELIST_V, NULL), - VAR("HidServRevCounter", LINELIST_S, HidServRevCounters, NULL), - V(HidServRevCounters, LINELIST_V, NULL), + V(HidServRevCounter, LINELIST, NULL), V(BWHistoryReadEnds, ISOTIME, NULL), V(BWHistoryReadInterval, UINT, "900"),

1 0

[tor/master] Don't double hash the ed25519 blind key parameter.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 4ad4467fa13a0e6333fa0016a63060d5b9dd9715 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 4 12:37:48 2017 +0300 Don't double hash the ed25519 blind key parameter. We used to do: h = H(BLIND_STRING | H(A | s | B | N ) when we should be doing: h = H(BLIND_STRING | A | s | B | N) Change the logic so that hs_common.c does the hashing, and our ed25519 libraries just receive the hashed parameter ready-made. That's easier than doing the hashing on the ed25519 libraries, since that means we would have to pass them a variable-length param (depending on whether 's' is set or not). Also fix the ed25519 test vectors since they were also double hashing. --- src/ext/ed25519/donna/ed25519_tor.c | 8 +------- src/ext/ed25519/ref10/blinding.c | 4 ++-- src/or/hs_common.c | 4 +++- src/test/ed25519_exts_ref.py | 6 ++---- src/test/ed25519_vectors.inc | 32 ++++++++++++++++---------------- 5 files changed, 24 insertions(+), 30 deletions(-) diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index 6bc22675a..44ec562f0 100644 --- a/src/ext/ed25519/donna/ed25519_tor.c +++ b/src/ext/ed25519/donna/ed25519_tor.c @@ -245,13 +245,7 @@ ed25519_donna_sign(unsigned char *sig, const unsigned char *m, size_t mlen, static void ed25519_donna_gettweak(unsigned char *out, const unsigned char *param) { - static const char str[] = "Derive temporary signing key"; - ed25519_hash_context ctx; - - ed25519_hash_init(&ctx); - ed25519_hash_update(&ctx, (const unsigned char*)str, strlen(str)); - ed25519_hash_update(&ctx, param, 32); - ed25519_hash_final(&ctx, out); + memcpy(out, param, 32); out[0] &= 248; /* Is this necessary ? */ out[31] &= 63; diff --git a/src/ext/ed25519/ref10/blinding.c b/src/ext/ed25519/ref10/blinding.c index 31332a271..a3b32fa80 100644 --- a/src/ext/ed25519/ref10/blinding.c +++ b/src/ext/ed25519/ref10/blinding.c @@ -12,8 +12,8 @@ static void ed25519_ref10_gettweak(unsigned char *out, const unsigned char *param) { - const char str[] = "Derive temporary signing key"; - crypto_hash_sha512_2(out, (const unsigned char*)str, strlen(str), param, 32); + memcpy(out, param, 32); + out[0] &= 248; /* Is this necessary necessary ? */ out[31] &= 63; out[31] |= 64; diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 2894d0a28..a29b37749 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -551,6 +551,7 @@ build_blinded_key_param(const ed25519_public_key_t *pubkey, uint8_t *param_out) { size_t offset = 0; + const char blind_str[] = "Derive temporary signing key"; uint8_t nonce[HS_KEYBLIND_NONCE_LEN]; crypto_digest_t *digest; @@ -568,8 +569,9 @@ build_blinded_key_param(const ed25519_public_key_t *pubkey, tor_assert(offset == HS_KEYBLIND_NONCE_LEN); /* Generate the parameter h and the construction is as follow: - * h = H(pubkey | [secret] | ed25519-basepoint | nonce) */ + * h = H(BLIND_STRING | pubkey | [secret] | ed25519-basepoint | N) */ digest = crypto_digest256_new(DIGEST_SHA3_256); + crypto_digest_add_bytes(digest, blind_str, sizeof(blind_str)); crypto_digest_add_bytes(digest, (char *) pubkey, ED25519_PUBKEY_LEN); /* Optional secret. */ if (secret) { diff --git a/src/test/ed25519_exts_ref.py b/src/test/ed25519_exts_ref.py index 189825654..f84d3002d 100644 --- a/src/test/ed25519_exts_ref.py +++ b/src/test/ed25519_exts_ref.py @@ -32,8 +32,7 @@ def curve25519ToEd25519(c, sign): return encodepoint([x,y]) def blindESK(esk, param): - h = H("Derive temporary signing key" + param) - mult = 2**(b-2) + sum(2**i * bit(h,i) for i in range(3,b-2)) + mult = 2**(b-2) + sum(2**i * bit(param,i) for i in range(3,b-2)) s = decodeint(esk[:32]) s_prime = (s * mult) % ell k = esk[32:] @@ -42,8 +41,7 @@ def blindESK(esk, param): return encodeint(s_prime) + k_prime def blindPK(pk, param): - h = H("Derive temporary signing key" + param) - mult = 2**(b-2) + sum(2**i * bit(h,i) for i in range(3,b-2)) + mult = 2**(b-2) + sum(2**i * bit(param,i) for i in range(3,b-2)) P = decodepoint(pk) return encodepoint(scalarmult(P, mult)) diff --git a/src/test/ed25519_vectors.inc b/src/test/ed25519_vectors.inc index 760bafb97..60c863beb 100644 --- a/src/test/ed25519_vectors.inc +++ b/src/test/ed25519_vectors.inc @@ -91,21 +91,21 @@ static const char *ED25519_BLINDING_PARAMS[] = { * blinding parameter. */ static const char *ED25519_BLINDED_SECRET_KEYS[] = { - "014e83abadb2ca9a27e0ffe23920333d817729f48700e97656ec2823d694050e171d43" + "293c3acff4e902f6f63ddc5d5caa2a57e771db4f24de65d4c28df3232f47fa01171d43" "f24e3f53e70ec7ac280044ac77d4942dee5d6807118a59bdf3ee647e89", - "fad8cca0b4335847795288b1452508752b253e64e6c7c78d4a02dbbd7d46aa0eb8ceff" + "38b88f9f9440358da544504ee152fb475528f7c51c285bd1c68b14ade8e29a07b8ceff" "20dfcf53eb52b891fc078c934efbf0353af7242e7dc51bb32a093afa29", - "116eb0ae0a4a91763365bdf86db427b00862db448487808788cc339ac10e5e089217f5" + "4d03ce16a3f3249846aac9de0a0075061495c3b027248eeee47da4ddbaf9e0049217f5" "2e92797462bd890fc274672e05c98f2c82970d640084781334aae0f940", - "bd1fbb0ee5acddc4adbcf5f33e95d9445f40326ce579fdd764a24483a9ccb20f509ece" + "51d7db01aaa0d937a9fd7c8c7381445a14d8fa61f43347af5460d7cd8fda9904509ece" "e77082ce088f7c19d5a00e955eeef8df6fa41686abc1030c2d76807733", - "237f5345cefe8573ce9fa7e216381a1172796c9e3f70668ab503b1352952530fb57b95" + "1f76cab834e222bd2546efa7e073425680ab88df186ff41327d3e40770129b00b57b95" "a440570659a440a3e4771465022a8e67af86bdf2d0990c54e7bb87ff9a", - "ba8ff23bc4ad2b739e1ccffc9fbc7837053ea81cdfdb15073f56411cfbae1d0ec492fc" + "c23588c23ee76093419d07b27c6df5922a03ac58f96c53671456a7d1bdbf560ec492fc" "87d5ec2a1b185ca5a40541fdef0b1e128fd5c2380c888bfa924711bcab", - "0fa68f969de038c7a90a4a74ee6167c77582006f2dedecc1956501ba6b6fb10391b476" + "3ed249c6932d076e1a2f6916975914b14e8c739da00992358b8f37d3e790650691b476" "8f8e556d78f4bdcb9a13b6f6066fe81d3134ae965dc48cd0785b3af2b8", - "deaa3456d1c21944d5dcd361a646858c6cf9336b0a6851d925717eb1ae186902053d9c" + "288cbfd923cb286d48c084555b5bdd06c05e92fb81acdb45271367f57515380e053d9c" "00c81e1331c06ab50087be8cfc7dc11691b132614474f1aa9c2503cccd", }; @@ -115,14 +115,14 @@ static const char *ED25519_BLINDED_SECRET_KEYS[] = { * blinding parameter. */ static const char *ED25519_BLINDED_PUBLIC_KEYS[] = { - "722d6da6348e618967ef782e71061e27163a8b35f21856475d9d2023f65b6495", - "1dffa0586da6cbfcff2024eedf4fc6c818242d9a82dbbe635d6da1b975a1160d", - "5ed81f98fed5a6acda4ea6da2c34fab0ab359d950c510c256473f1f33ff438b4", - "6e6f92a54fb282120c46d9603df41135f025bc1f58f283809d04be96aeb04040", - "cda236f28edc4c7e02d18007b8dab49d669265b0f7aefb1824d7cc8e73a2cd63", - "367b03b17b67ca7329b89a520bdab91782402a41cd67264e34b5541a4b3f875b", - "8d486b03ac4e3b486b7a1d563706c7fdac75aee789a7cf6f22789eedeff61a31", - "9f297ff0aa2ceda91c5ab1b6446f12533d145940de6d850dc323417afde0cb78", + "1fc1fa4465bd9d4956fdbdc9d3acb3c7019bb8d5606b951c2e1dfe0b42eaeb41", + "1cbbd4a88ce8f165447f159d9f628ada18674158c4f7c5ead44ce8eb0fa6eb7e", + "c5419ad133ffde7e0ac882055d942f582054132b092de377d587435722deb028", + "3e08d0dc291066272e313014bfac4d39ad84aa93c038478a58011f431648105f", + "59381f06acb6bf1389ba305f70874eed3e0f2ab57cdb7bc69ed59a9b8899ff4d", + "2b946a484344eb1c17c89dd8b04196a84f3b7222c876a07a4cece85f676f87d9", + "c6b585129b135f8769df2eba987e76e089e80ba3a2a6729134d3b28008ac098e", + "0eefdc795b59cabbc194c6174e34ba9451e8355108520554ec285acabebb34ac", }; /**

1 0

[tor/master] prop224 tests: Improve SRV protocol tests.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit 4a1b57e9b00c8474ada28dd052a2de73a1e9c641 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Aug 5 23:11:37 2017 +0300 prop224 tests: Improve SRV protocol tests. --- src/or/shared_random_state.c | 2 +- src/or/shared_random_state.h | 1 + src/test/test_shared_random.c | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 7f8094daf..cbf58e95f 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -133,7 +133,7 @@ get_voting_interval(void) /* Given the time now, return the start time of the current round of * the SR protocol. For example, if it's 23:47:08, the current round thus * started at 23:47:00 for a voting interval of 10 seconds. */ -static time_t +STATIC time_t get_start_time_of_current_round(time_t now) { const or_options_t *options = get_options(); diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index 03dd5eb37..837fa7539 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -130,6 +130,7 @@ unsigned int sr_state_get_protocol_run_duration(void); STATIC int disk_state_load_from_disk_impl(const char *fname); STATIC sr_phase_t get_sr_protocol_phase(time_t valid_after); +STATIC time_t get_start_time_of_current_round(time_t now); STATIC time_t get_state_valid_until_time(time_t now); STATIC const char *get_phase_str(sr_phase_t phase); diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index ea037d417..bee0ea0a3 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -260,6 +260,30 @@ test_get_start_time_of_current_run(void *arg) ; } +/** Do some rudimentary consistency checks between the functions that + * understand the shared random protocol schedule */ +static void +test_get_start_time_functions(void *arg) +{ + (void) arg; + time_t now = approx_time(); + + time_t start_time_of_protocol_run = + sr_state_get_start_time_of_current_protocol_run(now); + tt_assert(start_time_of_protocol_run); + + /* Check that the round start time of the beginning of the run, is itself */ + tt_int_op(get_start_time_of_current_round(start_time_of_protocol_run), OP_EQ, + start_time_of_protocol_run); + + /* Check that even if we increment the start time, we still get the start + time of the run as the beginning of the round. */ + tt_int_op(get_start_time_of_current_round(start_time_of_protocol_run+1), + OP_EQ, start_time_of_protocol_run); + + done: ; +} + static void test_get_sr_protocol_duration(void *arg) { @@ -1364,6 +1388,8 @@ struct testcase_t sr_tests[] = { NULL, NULL }, { "get_start_time_of_current_run", test_get_start_time_of_current_run, TT_FORK, NULL, NULL }, + { "get_start_time_functions", test_get_start_time_functions, + TT_FORK, NULL, NULL }, { "get_sr_protocol_duration", test_get_sr_protocol_duration, TT_FORK, NULL, NULL }, { "get_state_valid_until_time", test_get_state_valid_until_time, TT_FORK,

1 0

[tor/master] prop224 tests: Better HS time period tests.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit bd3213b17e6ff94bfd1c5deb3ecf2d906dd8d0b6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Aug 5 23:43:05 2017 +0300 prop224 tests: Better HS time period tests. --- src/test/test_hs_common.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 65c694838..cc62870cb 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -128,7 +128,7 @@ test_time_period(void *arg) (void) arg; uint64_t tn; int retval; - time_t fake_time; + time_t fake_time, correct_time, start_time; /* Let's do the example in prop224 section [TIME-PERIODS] */ retval = parse_rfc1123_time("Wed, 13 Apr 2016 11:00:00 UTC", @@ -145,6 +145,15 @@ test_time_period(void *arg) tn = hs_get_time_period_num(fake_time); tt_u64_op(tn, ==, 16903); + { /* Check start time of next time period */ + retval = parse_rfc1123_time("Wed, 13 Apr 2016 12:00:00 UTC", + &correct_time); + tt_int_op(retval, ==, 0); + + start_time = hs_get_start_time_of_next_time_period(fake_time); + tt_int_op(start_time, OP_EQ, correct_time); + } + /* Now take time to 12:00:00 UTC and check that the time period rotated */ fake_time += 1; tn = hs_get_time_period_num(fake_time); @@ -154,6 +163,24 @@ test_time_period(void *arg) tn = hs_get_next_time_period_num(fake_time); tt_u64_op(tn, ==, 16905); + { /* Check start time of next time period again */ + retval = parse_rfc1123_time("Wed, 14 Apr 2016 12:00:00 UTC", + &correct_time); + tt_int_op(retval, ==, 0); + + start_time = hs_get_start_time_of_next_time_period(fake_time); + tt_int_op(start_time, OP_EQ, correct_time); + } + + /* Now do another sanity check: The time period number at the start of the + * next time period, must be the same time period number as the one returned + * from hs_get_next_time_period_num() */ + { + time_t next_tp_start = hs_get_start_time_of_next_time_period(fake_time); + tt_int_op(hs_get_time_period_num(next_tp_start), OP_EQ, + hs_get_next_time_period_num(fake_time)); + } + done: ; }

1 0

[tor/master] prop224 tests: Better HS address tests.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit e70341deb7dd8a8f50b872e9f7f999a113bb62b0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Aug 5 23:25:44 2017 +0300 prop224 tests: Better HS address tests. --- src/or/hs_service.c | 2 +- src/or/hs_service.h | 3 +++ src/test/test_hs_common.c | 25 ++++++++++++++++++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 43528a428..6cb24a19a 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -848,7 +848,7 @@ register_all_services(void) /* Write the onion address of a given service to the given filename fname_ in * the service directory. Return 0 on success else -1 on error. */ -static int +STATIC int write_address_to_file(const hs_service_t *service, const char *fname_) { int ret = -1; diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 93d2710cd..8d613d23e 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -335,6 +335,9 @@ check_state_line_for_service_rev_counter(const char *state_line, const ed25519_public_key_t *blinded_pubkey, int *service_found_out); +STATIC int +write_address_to_file(const hs_service_t *service, const char *fname_); + #endif /* TOR_UNIT_TESTS */ #endif /* HS_SERVICE_PRIVATE */ diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 60577a2a5..65c694838 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -7,6 +7,7 @@ */ #define HS_COMMON_PRIVATE +#define HS_SERVICE_PRIVATE #include "test.h" #include "test_helpers.h" @@ -14,6 +15,7 @@ #include "hs_test_helpers.h" #include "hs_common.h" +#include "hs_service.h" #include "config.h" /** Test the validation of HS v3 addresses */ @@ -70,6 +72,18 @@ test_validate_address(void *arg) ; } +static int +mock_write_str_to_file(const char *path, const char *str, int bin) +{ + (void)bin; + tt_str_op(path, OP_EQ, "/double/five/squared"); + tt_str_op(str, OP_EQ, + "ijbeeqscijbeeqscijbeeqscijbeeqscijbeeqscijbeeqscijbezhid.onion\n"); + + done: + return 0; +} + /** Test building HS v3 onion addresses */ static void test_build_address(void *arg) @@ -77,9 +91,12 @@ test_build_address(void *arg) int ret; char onion_addr[HS_SERVICE_ADDR_LEN_BASE32 + 1]; ed25519_public_key_t pubkey; + hs_service_t *service = NULL; (void) arg; + MOCK(write_str_to_file, mock_write_str_to_file); + /* The following has been created with hs_build_address.py script that * follows proposal 224 specification to build an onion address. */ static const char *test_addr = @@ -94,8 +111,14 @@ test_build_address(void *arg) ret = hs_address_is_valid(onion_addr); tt_int_op(ret, OP_EQ, 1); + service = tor_malloc_zero(sizeof(hs_service_t)); + memcpy(service->onion_address, onion_addr, sizeof(service->onion_address)); + tor_asprintf(&service->config.directory_path, "/double/five"); + ret = write_address_to_file(service, "squared"); + tt_int_op(ret, OP_EQ, 0); + done: - ; + hs_service_free(service); } /** Test that our HS time period calculation functions work properly */

1 0

[tor/master] Fix broken intro point unittest.
by nickm＠torproject.org 08 Aug '17

08 Aug '17

commit fe0c40c9b344853963dc7af0f746d8c772bb3a97 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 4 23:46:20 2017 +0300 Fix broken intro point unittest. The structure was not zeroed out, and left some boolean fields uninitialized. --- src/test/test_hs_service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 10eeaa432..6a7b9b527 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1092,6 +1092,8 @@ test_build_update_descriptors(void *arg) tor_addr_t ipv4_addr; curve25519_secret_key_t curve25519_secret_key; + memset(&ri, 0, sizeof(routerinfo_t)); + tor_addr_parse(&ipv4_addr, "127.0.0.1"); ri.addr = tor_addr_to_ipv4h(&ipv4_addr); ri.or_port = 1337;

1 0