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

[tor/master] Avoid a needless decode/re-encode step in assigning onion keys
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 7113a339dc7c680b9e48565bfaf97a10185a5244 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 14 13:28:07 2018 -0500 Avoid a needless decode/re-encode step in assigning onion keys Previously we had decoded the asn.1 to get a public key, and then discarded the asn.1 so that we had to re-encode the key to store it in the onion_pkey field of a microdesc_t or routerinfo_t. Now we can just do a tor_memdup() instead, which should be loads faster. --- src/feature/dirparse/microdesc_parse.c | 4 ++-- src/feature/dirparse/routerparse.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index 8ad962637..165945e39 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -177,8 +177,8 @@ microdescs_parse_from_string(const char *s, const char *eos, "Relay's onion key had invalid exponent."); goto next; } - router_set_rsa_onion_pkey(tok->key, &md->onion_pkey, - &md->onion_pkey_len); + md->onion_pkey = tor_memdup(tok->object_body, tok->object_size); + md->onion_pkey_len = tok->object_size; crypto_pk_free(tok->key); if ((tok = find_opt_by_keyword(tokens, K_ONION_KEY_NTOR))) { diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 2249ab7cb..358f6e44e 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -588,8 +588,8 @@ router_parse_entry_from_string(const char *s, const char *end, "Relay's onion key had invalid exponent."); goto err; } - router_set_rsa_onion_pkey(tok->key, &router->onion_pkey, - &router->onion_pkey_len); + router->onion_pkey = tor_memdup(tok->object_body, tok->object_size); + router->onion_pkey_len = tok->object_size; crypto_pk_free(tok->key); if ((tok = find_opt_by_keyword(tokens, K_ONION_KEY_NTOR))) {

1 0

[tor/master] Add a function to provide an upper bound on base64 decoded length
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 3c35c0d441cc25f750524056113970a376d8432c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 14 13:07:55 2018 -0500 Add a function to provide an upper bound on base64 decoded length --- src/lib/encoding/binascii.c | 12 ++++++++++++ src/lib/encoding/binascii.h | 1 + src/test/test_util_format.c | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c index e9140d943..067db075a 100644 --- a/src/lib/encoding/binascii.c +++ b/src/lib/encoding/binascii.c @@ -179,6 +179,18 @@ base64_encode_size(size_t srclen, int flags) return enclen; } +/** Return an upper bound on the number of bytes that might be needed to hold + * the data from decoding the base64 string srclen. This is only an + * upper bound, since some part of the base64 string might be padding or + * space. */ +size_t +base64_decode_maxsize(size_t srclen) +{ + tor_assert(srclen < INT_MAX / 3); + + return CEIL_DIV(srclen * 3, 4); +} + /** Internal table mapping 6 bit values to the Base64 alphabet. */ static const char base64_encode_table[64] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', diff --git a/src/lib/encoding/binascii.h b/src/lib/encoding/binascii.h index 23cbaa707..c71ba65df 100644 --- a/src/lib/encoding/binascii.h +++ b/src/lib/encoding/binascii.h @@ -42,6 +42,7 @@ const char *hex_str(const char *from, size_t fromlen); #define BASE64_ENCODE_MULTILINE 1 size_t base64_encode_size(size_t srclen, int flags); +size_t base64_decode_maxsize(size_t srclen); int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, int flags); int base64_decode(char *dest, size_t destlen, const char *src, size_t srclen); diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index 85d8a8e62..fd57125b8 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -392,10 +392,13 @@ test_util_format_encoded_size(void *arg) base64_encode(outbuf, sizeof(outbuf), (char *)inbuf, i, 0); tt_int_op(strlen(outbuf), OP_EQ, base64_encode_size(i, 0)); + tt_int_op(i, OP_LE, base64_decode_maxsize(strlen(outbuf))); + base64_encode(outbuf, sizeof(outbuf), (char *)inbuf, i, BASE64_ENCODE_MULTILINE); tt_int_op(strlen(outbuf), OP_EQ, base64_encode_size(i, BASE64_ENCODE_MULTILINE)); + tt_int_op(i, OP_LE, base64_decode_maxsize(strlen(outbuf))); } done: @@ -417,4 +420,3 @@ struct testcase_t util_format_tests[] = { { "encoded_size", test_util_format_encoded_size, 0, NULL, NULL }, END_OF_TESTCASES }; -

1 0

[tor/master] Changes file for ticket28839
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 976c62e62a38c9f30c32ca742a43d59633a0e6ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 14 13:34:32 2018 -0500 Changes file for ticket28839 --- changes/ticket28839 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28839 b/changes/ticket28839 new file mode 100644 index 000000000..e9f81dc40 --- /dev/null +++ b/changes/ticket28839 @@ -0,0 +1,3 @@ + o Minor features (performance): + - Speed up microdesriptor parsing by about 30%, to help + improve startup time. Closes ticket 28839.

1 0

[tor/master] Merge branch 'ticket28839_v2_squashed'
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit bb091da1e7e229d6b938ae99d40078610b13ac76 Merge: 372df7a63 976c62e62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 18:59:05 2018 -0500 Merge branch 'ticket28839_v2_squashed' changes/ticket28839 | 3 +++ src/feature/dirparse/microdesc_parse.c | 4 ++-- src/feature/dirparse/parsecommon.c | 29 +++++++++++++----------- src/feature/dirparse/routerparse.c | 4 ++-- src/lib/encoding/binascii.c | 12 ++++++++++ src/lib/encoding/binascii.h | 1 + src/test/bench.c | 40 ++++++++++++++++++++++++++++++++++ src/test/test_parsecommon.c | 8 +++---- src/test/test_util_format.c | 4 +++- 9 files changed, 83 insertions(+), 22 deletions(-)

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 18 Dec '18

18 Dec '18

commit afb64b2f530f999399630b01fd93e838a46bd3b0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 23:15:25 2018 +0000 Update translations for donatepages-messagespot --- locale/es/LC_MESSAGES/messages.po | 26 +++++++++++++++++++++++--- locale/es_AR/LC_MESSAGES/messages.po | 17 +++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index 1bd21a250..e745f008b 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -403,6 +403,8 @@ msgstr "" msgid "" "The paid staff of the Tor Project is very small: about 47 people in total." msgstr "" +"El personal pago del Proyecto Tor es diminuto: cerca de 47 personas en " +"total." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90 msgid "" @@ -564,6 +566,8 @@ msgid "" "I would like to know more about how Tor works, what onion services are, or " "how to run a relay." msgstr "" +"Me gustaría saber más acerca de cómo funciona Tor, qué son los servicios " +"cebolla, o cómo correr un relevo." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158 msgid "" @@ -689,6 +693,9 @@ msgid "" " foundations, research institutions, private companies, and over 20,000 " "personal donations from people like you." msgstr "" +"Tor es apoyado por agencias financieras del gobierno de Estados Unidos, " +"ONGs, fundaciones privadas, instituciones de investigación, compañías " +"privadas, y cerca de 20.000 donaciones personales de gente como tú." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212 msgid "" @@ -737,7 +744,7 @@ msgstr "¿Cuánto dinero gasta el Proyecto Tor anualmente, y para qué es usado? #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:228 msgid "The Tor Project spends about $4 million annually." -msgstr "" +msgstr "El Proyecto Tor gasta anualmente cerca de USD 4 millones." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:230 #, php-format @@ -792,6 +799,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Isabela Bagueros, Executive Director " msgstr "" +"Número ID impositivo del Proyecto Tor (EIN #): 20-8096820 \n" +"Domicilio: \n" +"The Tor Project Inc. \n" +"217 First Avenue South #4903 \n" +"Seattle, WA 98194 \n" +"Número telefónico:206-420-3136 \n" +"Persona de contacto: Isabela Bagueros, Directora Ejecutiva " #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264 msgid "If I am not in the United States, can I still donate?" @@ -1072,6 +1086,8 @@ msgid "" "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in " "early 2019.)" msgstr "" +"(También, si quisieras, puedes darnos USD 4.999 a fines de 2018 y USD 4.999 " +"a principios de 2019 ;)" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403 msgid "" @@ -1246,6 +1262,8 @@ msgid "" "Our mailing address is The Tor Project, 217 First Avenue South #4903, " "Seattle WA 98194, USA" msgstr "" +"Nuestro domicilio postal es: The Tor Project, 217 First Avenue South #4903, " +"Seattle WA 98194, USA" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486 msgid "Do you accept cash donations?" @@ -1833,7 +1851,7 @@ msgstr "Comentarios" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:463 msgid "Donating:" -msgstr "" +msgstr "Donando:" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470 msgid "Donate" @@ -1899,7 +1917,7 @@ msgstr "Correo electrónico inválido." #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:537 msgid "per month" -msgstr "" +msgstr "por mes" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:551 msgid "One moment while we shovel coal into our servers." @@ -1910,6 +1928,8 @@ msgid "" "Stand up for the universal human rights to privacy and freedom and help keep" " Tor robust and secure." msgstr "" +"Plántate a favor de los derechos humanos universales a la privacidad y la " +"libertad, y ayuda a mantener Tor robusto y seguro." #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:640 msgid "Mozilla will match your gift and double your impact." diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index b6b487666..0d2acbf94 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -791,6 +791,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Isabela Bagueros, Executive Director " msgstr "" +"Número ID impositivo del Proyecto Tor (EIN #): 20-8096820 \n" +" Domicilio: \n" +" The Tor Project, Inc. \n" +" 217 First Avenue South #4903 \n" +" Seattle, WA 98194 \n" +" Número telefónico: 206-420-3136 \n" +" Persona de contacto: Isabela Bagueros, Directora Ejecutiva " #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264 msgid "If I am not in the United States, can I still donate?" @@ -1070,6 +1077,8 @@ msgid "" "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in " "early 2019.)" msgstr "" +"(También, si quisieras, podés darnos USD 4.999 a fines de 2018 y USD 4.999 a" +" principios de 2019 ;)" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403 msgid "" @@ -1243,6 +1252,8 @@ msgid "" "Our mailing address is The Tor Project, 217 First Avenue South #4903, " "Seattle WA 98194, USA" msgstr "" +"Nuestro domicilio postal es: The Tor Project, 217 First Avenue South #4903, " +"Seattle WA 98194, USA" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486 msgid "Do you accept cash donations?" @@ -1831,7 +1842,7 @@ msgstr "Comentarios" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:463 msgid "Donating:" -msgstr "" +msgstr "Donando:" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470 msgid "Donate" @@ -1897,7 +1908,7 @@ msgstr "Dirección de correo electrónico inválida" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:537 msgid "per month" -msgstr "" +msgstr "por mes" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:551 msgid "One moment while we shovel coal into our servers." @@ -1908,6 +1919,8 @@ msgid "" "Stand up for the universal human rights to privacy and freedom and help keep" " Tor robust and secure." msgstr "" +"Plantate a favor de los derechos humanos universales a la privacidad y la " +"libertad, y ayudá a mantener Tor robusto y seguro." #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:640 msgid "Mozilla will match your gift and double your impact."

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 18 Dec '18

18 Dec '18

commit 2f4f7917b67742398df8e8f9a3714ccf4682dacb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 22:47:32 2018 +0000 Update translations for tbmanual-contentspot_completed --- contents+es-AR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index adbce63bd..68e4b00f8 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -2364,7 +2364,7 @@ msgstr "Obtené actualizaciones y oportunidades mensuales del proyecto Tor" #: templates/footer.html:26 msgid "Sign up" -msgstr "" +msgstr "Suscribirte" #: templates/footer.html:32 msgid ""

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 18 Dec '18

18 Dec '18

commit 8c31171a1afe39aee85a390f9ec4a7b4cb6e050f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 22:47:24 2018 +0000 Update translations for tbmanual-contentspot --- contents+es-AR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index adbce63bd..68e4b00f8 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -2364,7 +2364,7 @@ msgstr "Obtené actualizaciones y oportunidades mensuales del proyecto Tor" #: templates/footer.html:26 msgid "Sign up" -msgstr "" +msgstr "Suscribirte" #: templates/footer.html:32 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 18 Dec '18

18 Dec '18

commit ee0c0192c7eae25538324e8c417ad63b1fd36c32 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 22:45:22 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 519f054d1..b6b487666 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -398,6 +398,8 @@ msgstr "" msgid "" "The paid staff of the Tor Project is very small: about 47 people in total." msgstr "" +"La plana rentada del Proyecto Tor es muy pequeña: cerca de 47 personas en " +"total." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90 msgid "" @@ -557,6 +559,8 @@ msgid "" "I would like to know more about how Tor works, what onion services are, or " "how to run a relay." msgstr "" +"Me gustaría saber más acerca de cómo funciona Tor, qué son servicios onion, " +"o cómo correr un relevo." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158 msgid "" @@ -682,6 +686,9 @@ msgid "" " foundations, research institutions, private companies, and over 20,000 " "personal donations from people like you." msgstr "" +"Tor está soportado por agencias financieras del gobierno de Estados Unidos, " +"ONGs, fundaciones privadas, instituciones de investigación, compañías " +"privadas, y cerca de 20.000 donaciones personales de gente como vos." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212 msgid "" @@ -729,7 +736,7 @@ msgstr "¿Cuánto dinero gasta el Proyecto Tor anualmente, y para qué se usa?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:228 msgid "The Tor Project spends about $4 million annually." -msgstr "" +msgstr "El Proyecto Tor gasta anualmente cerca de USD 4 millones." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:230 #, php-format

1 0

[tor/master] Always initialize addr in parse_port_config()
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 4894d44ab8beee587c99a1765236813d445b392e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:38:42 2018 -0500 Always initialize addr in parse_port_config() It was always analyzed before use, but scan-build wasn't able to persuade itself of that. Closes ticket 28881. --- changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket28881 b/changes/ticket28881 new file mode 100644 index 000000000..1b015a6c3 --- /dev/null +++ b/changes/ticket28881 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - When parsing a port configuration, make it more + obvious to static analyzer tools that we will always initialize the + address. Closes ticket 28881. diff --git a/src/app/config/config.c b/src/app/config/config.c index 81cc3e378..4a8f94da0 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6913,6 +6913,8 @@ parse_port_config(smartlist_t *out, for (; ports; ports = ports->next) { tor_addr_t addr; + tor_addr_make_unspec(&addr); + int port; int sessiongroup = SESSION_GROUP_UNSET; unsigned isolation = ISO_DEFAULT;

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 0af0f78dffc14919052d235de51a8fee71aaf1a5 Merge: a3e6f2467 702fd6f0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:52:39 2018 -0500 Merge branch 'maint-0.3.5' changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)

1 0