September 2019 - tor-commits - lists.torproject.org

[tor/master] Add a test for clear_fn support in handling non-managed fields
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit a3e99c5f1e2eb9dd9ead51bcbed61dc2b99cf256 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 27 13:18:38 2019 -0400 Add a test for clear_fn support in handling non-managed fields --- src/test/test_confmgr.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c index 170e8335e..5f73d9754 100644 --- a/src/test/test_confmgr.c +++ b/src/test/test_confmgr.c @@ -34,6 +34,8 @@ typedef struct { int cuteness; uint32_t magic; int eats_meat; /* deprecated; llamas are never carnivorous. */ + + char *description; // derived from other fields. } llama_cfg_t; typedef struct { @@ -87,6 +89,16 @@ static config_deprecation_t alpaca_deprecations[] = { {NULL,NULL} }; +static int clear_llama_cfg_called = 0; +static void +clear_llama_cfg(const config_mgr_t *mgr, void *llamacfg) +{ + (void)mgr; + llama_cfg_t *lc = llamacfg; + tor_free(lc->description); + ++clear_llama_cfg_called; +} + static config_abbrev_t llama_abbrevs[] = { { "gracia", "cuteness", 0, 0 }, { "gentillesse", "cuteness", 0, 0 }, @@ -115,6 +127,7 @@ static const config_format_t llama_fmt = { .config_suite_offset = -1, .deprecations = llama_deprecations, .abbrevs = llama_abbrevs, + .clear_fn = clear_llama_cfg, }; static const config_format_t alpaca_fmt = { @@ -250,6 +263,14 @@ test_confmgr_parse(void *arg) tt_int_op(lc->cuteness, OP_EQ, 42); tt_int_op(ac->fuzziness, OP_EQ, 50); + // We set the description for the llama here, so that the clear function + // can clear it. (Later we can do this in a verification function.) + clear_llama_cfg_called = 0; + llama_cfg_t *mut_lc = config_mgr_get_obj_mutable(mgr, p, LLAMA_IDX); + mut_lc->description = tor_strdup("A llama named Hugo."); + config_free(mgr, p); + tt_int_op(clear_llama_cfg_called, OP_EQ, 1); + done: config_free_lines(lines); config_free(mgr, p);

1 0

[tor/master] Merge branch 'ticket31240v2_merged_2' into ticket31240v2_merged_2_merged
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 17a870a64b300071144f8814ff4179aa58882387 Merge: f5fa283a0 c281fa0da Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 08:41:42 2019 -0400 Merge branch 'ticket31240v2_merged_2' into ticket31240v2_merged_2_merged src/app/config/config.c | 157 +++---- src/app/config/config.h | 5 +- src/app/config/confparse.c | 746 +++++++++++++++++++++++------- src/app/config/confparse.h | 86 ++-- src/app/config/or_options_st.h | 9 + src/app/config/or_state_st.h | 9 + src/app/config/statefile.c | 43 +- src/feature/dirauth/shared_random_state.c | 43 +- src/test/fuzz/fuzzing_common.c | 5 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_config.c | 92 ++-- src/test/test_confmgr.c | 325 +++++++++++++ src/test/test_confparse.c | 381 ++++++++++----- src/test/test_dir_handle_get.c | 3 +- src/test/test_entrynodes.c | 30 +- src/test/test_helpers.c | 2 +- src/test/test_hs_service.c | 10 +- src/test/test_options.c | 14 +- src/test/test_pt.c | 2 +- 21 files changed, 1477 insertions(+), 488 deletions(-) diff --cc src/test/test_confparse.c index 4df275fc3,f04c412c0..cf2e8a80e --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@@ -584,20 -599,19 +599,23 @@@ static voi test_confparse_reset(void *arg) { (void)arg; - test_struct_t *tst = get_simple_config(); + config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); + test_struct_t *tst = get_simple_config(mgr); - config_reset_line(&test_fmt, tst, "interval", 0); + config_reset_line(mgr, tst, "interval", 0); tt_int_op(tst->interval, OP_EQ, 0); - config_reset_line(&test_fmt, tst, "interval", 1); + config_reset_line(mgr, tst, "interval", 1); tt_int_op(tst->interval, OP_EQ, 10); + tt_ptr_op(tst->routerset, OP_NE, NULL); + config_reset_line(&test_fmt, tst, "routerset", 0); + tt_ptr_op(tst->routerset, OP_EQ, NULL); + done: - config_free(&test_fmt, tst); + config_free(mgr, tst); + config_mgr_free(mgr); } /* Try setting options a second time on a config object, and make sure

1 0

[tor/master] Better explain config_clear_fn_t
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 380d3ee1682ce5d202d754d442928710b477f59a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 19:36:17 2019 -0400 Better explain config_clear_fn_t --- src/app/config/confparse.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 9125c0be3..74ecb11a3 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -41,7 +41,13 @@ typedef int (*validate_fn_t)(void*,void*,void*,int,char**); struct config_mgr_t; -/** Callback to clear all non-managed fields of a configuration object. */ +/** + * Callback to clear all non-managed fields of a configuration object. + * + * (Regular fields get cleared by config_reset(), but you might have fields + * in the object that do not correspond to configuration variables. If those + * fields need to be cleared or freed, this is where to do it.) + */ typedef void (*clear_cfg_fn_t)(const struct config_mgr_t *mgr, void*); /** Information on the keys, value types, key-to-struct-member mappings,

1 0

[tor/master] Add a test for dumping a compound configuration
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit c967b5c9ba70c2c7f05aab5120c3415d53462ba7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 27 12:34:09 2019 -0400 Add a test for dumping a compound configuration --- src/test/test_confmgr.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c index 547fd5f42..170e8335e 100644 --- a/src/test/test_confmgr.c +++ b/src/test/test_confmgr.c @@ -257,6 +257,41 @@ test_confmgr_parse(void *arg) tor_free(msg); } +static void +test_confmgr_dump(void *arg) +{ + (void)arg; + config_mgr_t *mgr = get_mgr(true); + pasture_cfg_t *p = config_new(mgr); + pasture_cfg_t *defaults = config_new(mgr); + config_line_t *lines = NULL; + char *msg = NULL; + char *s = NULL; + + config_init(mgr, p); // set defaults. + config_init(mgr, defaults); // set defaults. + + int r = config_get_lines(simple_pasture, &lines, 0); + tt_int_op(r, OP_EQ, 0); + r = config_assign(mgr, p, lines, 0, &msg); + tt_int_op(r, OP_EQ, 0); + + s = config_dump(mgr, defaults, p, 1, 0); + tt_str_op("address 123 Camelid ave\n" + "alpacaname daphne\n" + "cuteness 42\n" + "llamaname hugo\n", OP_EQ, s); + + done: + config_free_lines(lines); + config_free(mgr, p); + config_free(mgr, defaults); + config_mgr_free(mgr); + + tor_free(msg); + tor_free(s); +} + #define CONFMGR_TEST(name, flags) \ { #name, test_confmgr_ ## name, flags, NULL, NULL } @@ -264,5 +299,6 @@ struct testcase_t confmgr_tests[] = { CONFMGR_TEST(init, 0), CONFMGR_TEST(magic, 0), CONFMGR_TEST(parse, 0), + CONFMGR_TEST(dump, 0), END_OF_TESTCASES };

1 0

[tor/master] Fix typo in a comment on config_mgr_get_obj_mutable()
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 577e628743bd7bb8c846bc73401e65b837cc4dbf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 27 13:10:18 2019 -0400 Fix typo in a comment on config_mgr_get_obj_mutable() --- src/app/config/confparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 71ba39ef5..e0615ac13 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -232,7 +232,7 @@ config_mgr_get_suite_ptr(const config_mgr_t *mgr, void *toplevel) * NOTE: XXXX Eventually, there will be multiple objects supported within the * toplevel object. For example, the or_options_t will contain pointers * to configuration objects for other modules. This function gets - * the sub-object for a particular modules. + * the sub-object for a particular module. */ STATIC void * config_mgr_get_obj_mutable(const config_mgr_t *mgr, void *toplevel, int idx)

1 0

[tor/master] Merge branch 'ticket31240v2' into ticket31240v2_merged_2
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit b1d7ddfb02cdbd23fce0c30d6ab4897ede18e7fe Merge: 35e978da6 a3e99c5f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 28 09:46:59 2019 -0400 Merge branch 'ticket31240v2' into ticket31240v2_merged_2 src/app/config/config.c | 157 +++---- src/app/config/config.h | 5 +- src/app/config/confparse.c | 746 +++++++++++++++++++++++------- src/app/config/confparse.h | 83 ++-- src/app/config/or_options_st.h | 9 + src/app/config/or_state_st.h | 9 + src/app/config/statefile.c | 43 +- src/feature/dirauth/shared_random_state.c | 43 +- src/test/fuzz/fuzzing_common.c | 5 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_config.c | 92 ++-- src/test/test_confmgr.c | 325 +++++++++++++ src/test/test_confparse.c | 381 ++++++++++----- src/test/test_dir_handle_get.c | 3 +- src/test/test_entrynodes.c | 30 +- src/test/test_helpers.c | 2 +- src/test/test_hs_service.c | 10 +- src/test/test_options.c | 14 +- src/test/test_pt.c | 2 +- 21 files changed, 1474 insertions(+), 488 deletions(-) diff --cc src/app/config/config.c index 740315f3e,66047aeab..0cbc223d0 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@@ -8133,11 -8125,10 +8125,10 @@@ getinfo_helper_config(control_connectio (void) errmsg; if (!strcmp(question, "config/names")) { smartlist_t *sl = smartlist_new(); - int i; - for (i = 0; option_vars_[i].member.name; ++i) { - const config_var_t *var = &option_vars_[i]; + smartlist_t *vars = config_mgr_list_vars(get_options_mgr()); + SMARTLIST_FOREACH_BEGIN(vars, const config_var_t *, var) { - /* don't tell controller about triple-underscore options */ - if (var->flags & CVFLAG_INVISIBLE) + /* don't tell controller about invisible options */ + if (config_var_is_invisible(var)) continue; const char *type = struct_var_get_typename(&var->member); if (!type) diff --cc src/app/config/confparse.c index 6e2624466,e0615ac13..f20a361ba --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@@ -651,13 -1073,13 +1083,13 @@@ config_dump(const config_mgr_t *mgr, co continue; } /* Don't save 'hidden' control variables. */ - if (! config_var_is_dumpable(&fmt->vars[i])) - if (mv->cvar->flags & CVFLAG_NODUMP) ++ if (! config_var_is_dumpable(mv->cvar)) continue; - if (minimal && config_is_same(fmt, options, defaults, - fmt->vars[i].member.name)) + const char *name = mv->cvar->member.name; + if (minimal && config_is_same(mgr, options, defaults, name)) continue; else if (comment_defaults && - config_is_same(fmt, options, defaults, fmt->vars[i].member.name)) + config_is_same(mgr, options, defaults, name)) comment_option = 1; line = assigned =

1 0

[tor/master] Describe clear_cfg_fn_t better.
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit c281fa0da20ebb2cd6849b52ff45e114075fd88a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 09:14:51 2019 -0400 Describe clear_cfg_fn_t better. --- src/app/config/confparse.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 0ff33f6ed..b788e2cd1 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -44,11 +44,14 @@ struct config_mgr_t; /** * Callback to clear all non-managed fields of a configuration object. * + * obj is the configuration object whose non-managed fields should be + * cleared. + * * (Regular fields get cleared by config_reset(), but you might have fields * in the object that do not correspond to configuration variables. If those * fields need to be cleared or freed, this is where to do it.) */ -typedef void (*clear_cfg_fn_t)(const struct config_mgr_t *mgr, void*); +typedef void (*clear_cfg_fn_t)(const struct config_mgr_t *mgr, void *obj); /** Information on the keys, value types, key-to-struct-member mappings, * variable descriptions, validation functions, and abbreviations for a

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 04 Sep '19

04 Sep '19

commit 2752f1ee1ca196b015e79204cb5693af572cec41 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 4 14:15:33 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- nl/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 2b05264fc..aba1d4600 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -22,7 +22,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> -<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een organisatie zonder winstoogmerk (volgens sectie 501(c)(3) van het Amerikaanse belastingreglement) die rechten en vrijheden van de mens bevordert door het maken en toepassen van vrije, open broncode anonimiteits- en privacytechnologieën, door de onbeperkte beschikbaarheid en het gebruik van zulke technologieën te ondersteunen en door zich in te zetten om het begrip voor die technologieën, zowel in de wetenschap als bij het algemeen publiek, te bevorderen."> +<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een organisatie zonder winstoogmerk (volgens sectie 501(c)(3) van het Amerikaanse belastingreglement) die rechten en vrijheden van de mens bevordert door het maken en toepassen van vrije, open-broncode anonimiteits- en privacytechnologieën, door de onbeperkte beschikbaarheid en het gebruik van zulke technologieën te ondersteunen en door zich in te zetten om het begrip voor die technologieën, zowel in de wetenschap als bij het algemeen publiek, te bevorderen."> <!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1270'
by nickm＠torproject.org 04 Sep '19

04 Sep '19

commit 46a38206525632671a606319962decc2874467dc Merge: f5fa283a0 063cf9cd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 09:52:35 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1270' changes/ticket31545 | 5 ++ src/feature/nodelist/describe.c | 101 +++++++++++++++++++++++++++++++--------- src/lib/string/compat_string.h | 3 ++ 3 files changed, 87 insertions(+), 22 deletions(-)

1 0

[tor/master] nodelist: Use safe string functions in describe.c
by nickm＠torproject.org 04 Sep '19

04 Sep '19

commit ec6fbf1ca613c11dc783182a11bc1d04f6a3fb63 Author: teor <teor(a)torproject.org> Date: Thu Aug 29 12:39:44 2019 +1000 nodelist: Use safe string functions in describe.c Rewrite format_node_description() and router_get_verbose_nickname() to use strlcpy() and strlcat(). The previous implementation used memcpy() and pointer arithmetic, which was error-prone. Closes ticket 31545. This is CID 1452819. --- changes/ticket31545 | 5 ++ src/feature/nodelist/describe.c | 101 +++++++++++++++++++++++++++++++--------- 2 files changed, 84 insertions(+), 22 deletions(-) diff --git a/changes/ticket31545 b/changes/ticket31545 new file mode 100644 index 000000000..58921c2ad --- /dev/null +++ b/changes/ticket31545 @@ -0,0 +1,5 @@ + o Code simplification and refactoring: + - Rewrite format_node_description() and router_get_verbose_nickname() to + use strlcpy() and strlcat(). The previous implementation used memcpy() + and pointer arithmetic, which was error-prone. + Closes ticket 31545. This is CID 1452819. diff --git a/src/feature/nodelist/describe.c b/src/feature/nodelist/describe.c index 7ec18438c..1e4683768 100644 --- a/src/feature/nodelist/describe.c +++ b/src/feature/nodelist/describe.c @@ -29,7 +29,8 @@ * NULL or the null address. The addr32h field is optional and may be * set to 0. * - * Return a pointer to the front of buf, or a string constant on error. + * Return a pointer to the front of buf. + * If buf is NULL, return a string constant describing the error. */ STATIC const char * format_node_description(char *buf, @@ -38,7 +39,7 @@ format_node_description(char *buf, const tor_addr_t *addr, uint32_t addr32h) { - char *cp; + size_t rv = 0; bool has_addr = addr && !tor_addr_is_null(addr); if (!buf) @@ -47,34 +48,67 @@ format_node_description(char *buf, memset(buf, 0, NODE_DESC_BUF_LEN); if (!id_digest) { - memcpy(buf, "<NULL ID DIGEST>", 17); + /* strlcpy() returns the length of the source string it attempted to copy, + * ignoring any required truncation due to the buffer length. */ + rv = strlcpy(buf, "<NULL ID DIGEST>", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); return buf; } - buf[0] = '$'; - base16_encode(buf+1, HEX_DIGEST_LEN+1, id_digest, DIGEST_LEN); - cp = buf+1+HEX_DIGEST_LEN; + /* strlcat() returns the length of the concatenated string it attempted to + * create, ignoring any required truncation due to the buffer length. */ + rv = strlcat(buf, "$", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); + + { + char hex_digest[HEX_DIGEST_LEN+1]; + memset(hex_digest, 0, sizeof(hex_digest)); + + base16_encode(hex_digest, sizeof(hex_digest), + id_digest, DIGEST_LEN); + rv = strlcat(buf, hex_digest, NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); + } + if (nickname) { - buf[1+HEX_DIGEST_LEN] = '~'; - strlcpy(buf+1+HEX_DIGEST_LEN+1, nickname, MAX_NICKNAME_LEN+1); - cp += strlen(cp); + rv = strlcat(buf, "~", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); + rv = strlcat(buf, nickname, NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } if (addr32h || has_addr) { - memcpy(cp, " at ", 4); - cp += 4; + rv = strlcat(buf, " at ", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } if (addr32h) { + int ntoa_rv = 0; + char ipv4_addr_str[INET_NTOA_BUF_LEN]; + memset(ipv4_addr_str, 0, sizeof(ipv4_addr_str)); struct in_addr in; + memset(&in, 0, sizeof(in)); + in.s_addr = htonl(addr32h); - tor_inet_ntoa(&in, cp, INET_NTOA_BUF_LEN); - cp += strlen(cp); + ntoa_rv = tor_inet_ntoa(&in, ipv4_addr_str, sizeof(ipv4_addr_str)); + tor_assert_nonfatal(ntoa_rv >= 0); + + rv = strlcat(buf, ipv4_addr_str, NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } + /* Both addresses are valid */ if (addr32h && has_addr) { - memcpy(cp, " and ", 5); - cp += 5; + rv = strlcat(buf, " and ", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } if (has_addr) { - tor_addr_to_str(cp, addr, TOR_ADDR_BUF_LEN, 1); + const char *str_rv = NULL; + char addr_str[TOR_ADDR_BUF_LEN]; + memset(addr_str, 0, sizeof(addr_str)); + + str_rv = tor_addr_to_str(addr_str, addr, sizeof(addr_str), 1); + tor_assert_nonfatal(str_rv == addr_str); + + rv = strlcat(buf, addr_str, NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } return buf; @@ -92,6 +126,7 @@ router_describe(const routerinfo_t *ri) if (!ri) return "<null>"; + return format_node_description(buf, ri->cache_info.identity_digest, ri->nickname, @@ -152,6 +187,7 @@ routerstatus_describe(const routerstatus_t *rs) if (!rs) return "<null>"; + return format_node_description(buf, rs->identity_digest, rs->nickname, @@ -171,6 +207,7 @@ extend_info_describe(const extend_info_t *ei) if (!ei) return "<null>"; + return format_node_description(buf, ei->identity_digest, ei->nickname, @@ -188,19 +225,39 @@ extend_info_describe(const extend_info_t *ei) void router_get_verbose_nickname(char *buf, const routerinfo_t *router) { + size_t rv = 0; + if (!buf) return; memset(buf, 0, MAX_VERBOSE_NICKNAME_LEN+1); if (!router) { - memcpy(buf, "<null>", 7); + /* strlcpy() returns the length of the source string it attempted to copy, + * ignoring any required truncation due to the buffer length. */ + rv = strlcpy(buf, "<null>", MAX_VERBOSE_NICKNAME_LEN+1); + tor_assert_nonfatal(rv < MAX_VERBOSE_NICKNAME_LEN+1); return; } - buf[0] = '$'; - base16_encode(buf+1, HEX_DIGEST_LEN+1, router->cache_info.identity_digest, - DIGEST_LEN); - buf[1+HEX_DIGEST_LEN] = '~'; - strlcpy(buf+1+HEX_DIGEST_LEN+1, router->nickname, MAX_NICKNAME_LEN+1); + /* strlcat() returns the length of the concatenated string it attempted to + * create, ignoring any required truncation due to the buffer length. */ + rv = strlcat(buf, "$", MAX_VERBOSE_NICKNAME_LEN+1); + tor_assert_nonfatal(rv < MAX_VERBOSE_NICKNAME_LEN+1); + + { + char hex_digest[HEX_DIGEST_LEN+1]; + memset(hex_digest, 0, sizeof(hex_digest)); + + base16_encode(hex_digest, sizeof(hex_digest), + router->cache_info.identity_digest, DIGEST_LEN); + rv = strlcat(buf, hex_digest, MAX_VERBOSE_NICKNAME_LEN+1); + tor_assert_nonfatal(rv < MAX_VERBOSE_NICKNAME_LEN+1); + } + + rv = strlcat(buf, "~", MAX_VERBOSE_NICKNAME_LEN+1); + tor_assert_nonfatal(rv < MAX_VERBOSE_NICKNAME_LEN+1); + + rv = strlcat(buf, router->nickname, MAX_VERBOSE_NICKNAME_LEN+1); + tor_assert_nonfatal(rv < MAX_VERBOSE_NICKNAME_LEN+1); }

1 0