nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Improve HS v3 helper for building intro points.

Browse Source 
Valid intro points need both legacy key and ipv4.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
George Kadianakis 2017-08-29 18:37:31 +03:00
parent 75ec72f24d
commit 29aa400908
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/test/hs_test_helpers.c
View File

@ -18,28 +18,29 @@ hs_helper_build_intro_point(const ed25519_keypair_t *signing_kp, time_t now,
hs_desc_intro_point_t *intro_point = NULL; hs_desc_intro_point_t *intro_point = NULL;
hs_desc_intro_point_t *ip = hs_desc_intro_point_new(); hs_desc_intro_point_t *ip = hs_desc_intro_point_new();
/* For a usable intro point we need at least two link specifiers: One legacy
* keyid and one ipv4 */
{ {
hs_desc_link_specifier_t *ls = tor_malloc_zero(sizeof(*ls)); hs_desc_link_specifier_t *ls_legacy = tor_malloc_zero(sizeof(*ls_legacy));
if (legacy) { hs_desc_link_specifier_t *ls_v4 = tor_malloc_zero(sizeof(*ls_v4));
ls->type = LS_LEGACY_ID; ls_legacy->type = LS_LEGACY_ID;
memcpy(ls->u.legacy_id, "0299F268FCA9D55CD157976D39AE92B4B455B3A8", memcpy(ls_legacy->u.legacy_id, "0299F268FCA9D55CD157976D39AE92B4B455B3A8",
DIGEST_LEN); DIGEST_LEN);
} else { ls_v4->u.ap.port = 9001;
ls->u.ap.port = 9001; int family = tor_addr_parse(&ls_v4->u.ap.addr, addr);
int family = tor_addr_parse(&ls->u.ap.addr, addr); switch (family) {
switch (family) { case AF_INET:
case AF_INET: ls_v4->type = LS_IPV4;
ls->type = LS_IPV4;
break; break;
case AF_INET6: case AF_INET6:
ls->type = LS_IPV6; ls_v4->type = LS_IPV6;
break; break;
default: default:
/* Stop the test, not suppose to have an error. */ /* Stop the test, not suppose to have an error. */
tt_int_op(family, OP_EQ, AF_INET); tt_int_op(family, OP_EQ, AF_INET);
}
} }
smartlist_add(ip->link_specifiers, ls); smartlist_add(ip->link_specifiers, ls_legacy);
smartlist_add(ip->link_specifiers, ls_v4);
} }
ret = ed25519_keypair_generate(&auth_kp, 0); ret = ed25519_keypair_generate(&auth_kp, 0);
@ -137,7 +138,7 @@ hs_helper_build_hs_desc_impl(unsigned int no_ip,
smartlist_add(desc->encrypted_data.intro_points, smartlist_add(desc->encrypted_data.intro_points,
hs_helper_build_intro_point(signing_kp, now, "3.2.1.4", 1)); hs_helper_build_intro_point(signing_kp, now, "3.2.1.4", 1));
smartlist_add(desc->encrypted_data.intro_points, smartlist_add(desc->encrypted_data.intro_points,
hs_helper_build_intro_point(signing_kp, now, "", 1)); hs_helper_build_intro_point(signing_kp, now, "5.6.7.8", 1));
} }
descp = desc; descp = desc;