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

[tor/master] Add improved debugging support to crypto_rand_fast code.
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 587a525cc5aedaee51fff33a78f004f103a4e0c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 12:03:48 2019 -0400 Add improved debugging support to crypto_rand_fast code. --- src/lib/crypt_ops/crypto_rand.h | 4 ++++ src/lib/crypt_ops/crypto_rand_fast.c | 46 +++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/lib/crypt_ops/crypto_rand.h b/src/lib/crypt_ops/crypto_rand.h index c51d6a448..528f238fa 100644 --- a/src/lib/crypt_ops/crypto_rand.h +++ b/src/lib/crypt_ops/crypto_rand.h @@ -92,6 +92,10 @@ void crypto_rand_fast_shutdown(void); #if defined(TOR_UNIT_TESTS) /* Used for white-box testing */ size_t crypto_fast_rng_get_bytes_used_per_stream(void); +/* For deterministic prng implementations */ +void crypto_fast_rng_disable_reseed(crypto_fast_rng_t *rng); +/* To override the prng for testing. */ +crypto_fast_rng_t *crypto_replace_thread_fast_rng(crypto_fast_rng_t *rng); #endif #ifdef CRYPTO_RAND_PRIVATE diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index dd9bf051c..b71ade81b 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -95,8 +95,13 @@ CTASSERT(KEY_BITS == 128 || KEY_BITS == 192 || KEY_BITS == 256); struct crypto_fast_rng_t { /** How many more fills does this buffer have before we should mix - * in the output of crypto_rand()? */ - uint16_t n_till_reseed; + * in the output of crypto_strongest_rand()? + * + * This value may be negative if unit tests are enabled. If so, it + * indicates that we should never mix in extra data from + * crypto_strongest_rand(). + */ + int16_t n_till_reseed; /** How many bytes are remaining in cbuf.bytes? */ uint16_t bytes_left; #ifdef CHECK_PID @@ -181,6 +186,18 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) return result; } +#ifdef TOR_UNIT_TESTS +/** + * Unit tests only: prevent a crypto_fast_rng_t from ever mixing in more + * entropy. + */ +void +crypto_fast_rng_disable_reseed(crypto_fast_rng_t *rng) +{ + rng->n_till_reseed = -1; +} +#endif + /** * Helper: create a crypto_cipher_t object from SEED_LEN bytes of * input. The first KEY_LEN bytes are used as the stream cipher's key, @@ -222,10 +239,19 @@ crypto_fast_rng_add_entopy(crypto_fast_rng_t *rng) static void crypto_fast_rng_refill(crypto_fast_rng_t *rng) { - if (rng->n_till_reseed-- == 0) { + rng->n_till_reseed--; + if (rng->n_till_reseed == 0) { /* It's time to reseed the RNG. */ crypto_fast_rng_add_entopy(rng); rng->n_till_reseed = RESEED_AFTER; + } else if (rng->n_till_reseed < 0) { +#ifdef TOR_UNIT_TESTS + /* Reseeding is disabled for testing; never do it on this prng. */ + rng->n_till_reseed = -1; +#else + /* If testing is disabled, this shouldn't be able to become negative. */ + tor_assert_unreached(); +#endif } /* Now fill rng->buf with output from our stream cipher, initialized from * that seed value. */ @@ -371,6 +397,20 @@ destroy_thread_fast_rng(void) tor_threadlocal_set(&thread_rng, NULL); } +#ifdef TOR_UNIT_TESTS +/** + * Replace the current thread's rng with <b>rng</b>. For use by the + * unit tests only. Returns the previous thread rng. + **/ +crypto_fast_rng_t * +crypto_replace_thread_fast_rng(crypto_fast_rng_t *rng) +{ + crypto_fast_rng_t *old_rng = tor_threadlocal_get(&thread_rng); + tor_threadlocal_set(&thread_rng, rng); + return old_rng; +} +#endif + /** * Initialize the global thread-local key that will be used to keep track * of per-thread fast RNG instances. Called from the crypto subsystem's

1 0

[tor/master] Make the deterministic and reproducible rng test code handle fast_rng
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 604e849d36232def4fa186c4eee4c1caa551e894 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 12:15:46 2019 -0400 Make the deterministic and reproducible rng test code handle fast_rng --- src/test/rng_test_helpers.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/test/rng_test_helpers.c b/src/test/rng_test_helpers.c index aaf42ca05..c11709ed8 100644 --- a/src/test/rng_test_helpers.c +++ b/src/test/rng_test_helpers.c @@ -32,6 +32,11 @@ */ static tor_mutex_t *rng_mutex = NULL; +/** + * Cached old value for the thread prng. + **/ +static crypto_fast_rng_t *stored_fast_rng = NULL; + /** replacement for crypto_strongest_rand that delegates to crypto_rand. */ static void mock_crypto_strongest_rand(uint8_t *out, size_t len) @@ -87,12 +92,21 @@ enable_deterministic_rng_impl(const uint8_t *seed, size_t seed_len) crypto_xof_add_bytes(rng_xof, rng_seed, sizeof(rng_seed)); MOCK(crypto_rand, crypto_rand_deterministic); MOCK(crypto_strongest_rand_, mock_crypto_strongest_rand); + + uint8_t fast_rng_seed[CRYPTO_FAST_RNG_SEED_LEN]; + memset(fast_rng_seed, 0xff, sizeof(fast_rng_seed)); + memcpy(fast_rng_seed, rng_seed, MIN(sizeof(rng_seed), + sizeof(fast_rng_seed))); + crypto_fast_rng_t *fast_rng = crypto_fast_rng_new_from_seed(fast_rng_seed); + crypto_fast_rng_disable_reseed(fast_rng); + stored_fast_rng = crypto_replace_thread_fast_rng(fast_rng); } /** - * Replace our crypto_rand() and crypto_strongest_rand() prngs with a variant - * that generates all of its output deterministically from a randomly chosen - * seed. In the event of an error, you can log the seed later on with + * Replace our get_thread_fast_rng(), crypto_rand() and + * crypto_strongest_rand() prngs with a variant that generates all of its + * output deterministically from a randomly chosen seed. In the event of an + * error, you can log the seed later on with * testing_dump_reproducible_rng_seed. **/ void @@ -104,10 +118,10 @@ testing_enable_reproducible_rng(void) } /** - * Replace our crypto_rand() and crypto_strongest_rand() prngs with a variant - * that generates all of its output deterministically from a fixed seed. This - * variant is mainly useful for cases when we don't want coverage to change - * between runs. + * Replace our get_thread_fast_rng(), crypto_rand() and + * crypto_strongest_rand() prngs with a variant that generates all of its + * output deterministically from a fixed seed. This variant is mainly useful + * for cases when we don't want coverage to change between runs. * * USAGE NOTE: Test correctness SHOULD NOT depend on the specific output of * this "rng". If you need a specific output, use @@ -151,6 +165,9 @@ crypto_rand_prefilled(char *out, size_t n) * Replace our crypto_rand() and crypto_strongest_rand() prngs with a variant * that yields output from a buffer. If it reaches the end of the buffer, it * starts over. + * + * Note: the get_thread_fast_rng() prng is not replaced by this; we'll need + * more code to support that. **/ void testing_enable_prefilled_rng(const void *buffer, size_t buflen) @@ -188,4 +205,7 @@ testing_disable_rng_override(void) UNMOCK(crypto_rand); UNMOCK(crypto_strongest_rand_); tor_mutex_free(rng_mutex); + + crypto_fast_rng_t *rng = crypto_replace_thread_fast_rng(stored_fast_rng); + crypto_fast_rng_free(rng); }

1 0

[tor/master] Changes file for 29732.
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 48e1ab17204944e6197002dfa3d3d0c8a08184dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 12:50:35 2019 -0400 Changes file for 29732. --- changes/ticket29732 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket29732 b/changes/ticket29732 new file mode 100644 index 000000000..bb72361c4 --- /dev/null +++ b/changes/ticket29732 @@ -0,0 +1,5 @@ + o Minor features (testing): + - Tor's unit test code now contains a standard set of functions to + replace the PRNG with a deterministic or reproducible version for + testing. Previously, various tests implemented this in various ways. + Implements ticket 29732.

1 0

[tor/master] Merge branch 'tor-github/pr/909'
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit e543c4e20c50035df61cdfaae75ee4dbb61409bf Merge: 44e6663b8 48e1ab172 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 30 11:17:45 2019 -0400 Merge branch 'tor-github/pr/909' Signed-off-by: David Goulet <dgoulet(a)torproject.org> changes/ticket29732 | 5 + src/lib/crypt_ops/crypto_rand.h | 4 + src/lib/crypt_ops/crypto_rand_fast.c | 82 ++++++++++--- src/test/include.am | 3 + src/test/rng_test_helpers.c | 226 +++++++++++++++++++++++++++++++++++ src/test/rng_test_helpers.h | 26 ++++ src/test/test.c | 20 +--- src/test/test_addr.c | 41 +++---- src/test/test_extorport.c | 25 ++-- src/test/test_hs_descriptor.c | 12 +- src/test/test_prob_distr.c | 75 +++--------- 11 files changed, 373 insertions(+), 146 deletions(-)

1 0

[tor/master] Make sure that the rng is not replaced if it is already replaced.
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 730dddc3806f904b4328f4e9281d370c65522c30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 12:50:11 2019 -0400 Make sure that the rng is not replaced if it is already replaced. --- src/test/rng_test_helpers.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/rng_test_helpers.c b/src/test/rng_test_helpers.c index c11709ed8..262d380bd 100644 --- a/src/test/rng_test_helpers.c +++ b/src/test/rng_test_helpers.c @@ -25,6 +25,11 @@ #endif /** + * True iff the RNG is currently replaced. Prevents double-replacement. + **/ +static bool rng_is_replaced = false; + +/** * Mutex to protect deterministic prng. * * Note that if you actually _use_ the prng from two threads at the same time, @@ -82,6 +87,9 @@ crypto_rand_deterministic(char *out, size_t n) static void enable_deterministic_rng_impl(const uint8_t *seed, size_t seed_len) { + tor_assert(!rng_is_replaced); + tor_assert(crypto_rand == crypto_rand__real); + memset(rng_seed, 0, sizeof(rng_seed)); memcpy(rng_seed, seed, MIN(seed_len, sizeof(rng_seed))); @@ -100,6 +108,8 @@ enable_deterministic_rng_impl(const uint8_t *seed, size_t seed_len) crypto_fast_rng_t *fast_rng = crypto_fast_rng_new_from_seed(fast_rng_seed); crypto_fast_rng_disable_reseed(fast_rng); stored_fast_rng = crypto_replace_thread_fast_rng(fast_rng); + + rng_is_replaced = true; } /** @@ -196,6 +206,9 @@ testing_prefilled_rng_reset(void) /** * Undo the overrides for our PRNG. To be used at the end of testing. + * + * Note that this function should be safe to call even if the rng has not + * yet been replaced. **/ void testing_disable_rng_override(void) @@ -208,4 +221,6 @@ testing_disable_rng_override(void) crypto_fast_rng_t *rng = crypto_replace_thread_fast_rng(stored_fast_rng); crypto_fast_rng_free(rng); + + rng_is_replaced = false; }

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit d6dc6c40d30d1bbf8776ad16d09120b95244334f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:50:45 2019 +0000 Update translations for tpo-web --- contents+fr.po | 12 ++++++------ contents+ru.po | 27 +++++++++++++++++++-------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index a2e8e649d..a88057d94 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -910,11 +910,11 @@ msgstr "" #: templates/home.html:24 msgid "Defend Against Surveillance" -msgstr "Se défendre contre la surveillance" +msgstr "Défendre contre la surveillance" #: templates/home.html:28 msgid "DEFEND AGAINST SURVEILLANCE" -msgstr "SE DÉFENDRE CONTRE LA SURVEILLANCE" +msgstr "DÉFENDRE CONTRE LA SURVEILLANCE" #: templates/home.html:29 msgid "" @@ -942,11 +942,11 @@ msgstr "" #: templates/home.html:58 msgid "Multi-layered Encryption" -msgstr "" +msgstr "Chiffrement multicouche" #: templates/home.html:62 msgid "MULTI-LAYERED ENCRYPTION" -msgstr "" +msgstr "CHIFFREMENT MULTICOUCHE" #: templates/home.html:63 msgid "" @@ -957,11 +957,11 @@ msgstr "" #: templates/home.html:75 msgid "Browse Freely" -msgstr "" +msgstr "Naviguer en toute liberté" #: templates/home.html:79 msgid "BROWSE FREELY" -msgstr "" +msgstr "NAVIGUER EN TOUTE LIBERTÉ" #: templates/home.html:80 msgid "" diff --git a/contents+ru.po b/contents+ru.po index c3a4dc010..0a288d0f6 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -562,14 +562,15 @@ msgstr "" #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." msgstr "" +"наблюдайте за открытыми встречами нашей команды (или присоединяйтесь!)" #: templates/contact.html:13 msgid "Discuss running a Tor relay." -msgstr "" +msgstr "вопросы поддержки узлов Tor" #: templates/contact.html:14 msgid "Talk with Tor's global south community." -msgstr "" +msgstr "канал для сообщества активистов \"глобального юга\"" #: templates/contact.html:20 msgid "Find us on Social Media" @@ -577,7 +578,7 @@ msgstr "Мы в социальных сетях" #: templates/contact.html:34 msgid "Volunteer with Tor" -msgstr "Стать волонтером с Tor" +msgstr "Стать волонтером в сети Tor" #: templates/contact.html:38 msgid "Get Involved" @@ -594,10 +595,14 @@ msgid "" "our support portal, you can ask the appropriate list. You're welcome to " "subscribe and just watch, too :)" msgstr "" +"Наши активисты взаимодействуют в разных каналах, включая списки рассылки. Вы" +" можете присоединиться. Если у вас есть вопрос по работе конкретной группы " +"активистов и вы не нашли ответ на Портале поддержки, можете задать его в " +"соответствующей рассылке. А можно просто подписаться и читать :)" #: templates/contact.html:60 msgid "Report a bug or give feedback." -msgstr "" +msgstr "Напишите нам об ошибке или чем-то еще" #: templates/contact.html:61 msgid "" @@ -611,7 +616,7 @@ msgstr "" #: templates/contact.html:67 msgid "Tell us about a bad relay." -msgstr "Сообщите о плохом узле." +msgstr "Сообщите о плохом узле" #: templates/contact.html:68 msgid "" @@ -624,7 +629,7 @@ msgstr "" #: templates/contact.html:76 msgid "Report a security issue." -msgstr "Сообщите о проблеме с безопасностью." +msgstr "Сообщите о проблеме с безопасностью" #: templates/contact.html:77 msgid "" @@ -634,10 +639,16 @@ msgid "" "contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-" "keyservers.net. Here is the fingerprint:" msgstr "" +"Если вы нашли уязвимость в одном из наших проектов или в нашей " +"инфраструктуре, пожалуйста, напишите сюда: tor-" +"security(a)lists.torproject.org. Хотите зашифровать свое письмо? Используйте " +"наш открытый GPG-ключ (можно получить по запросу tor-security-" +"sendkey(a)lists.torproject.org или с сервера pool.sks-keyservers.net) " +"Отпечаток:" #: templates/contact.html:97 msgid "Email us" -msgstr "Напишите нам" +msgstr "E-mail" #: templates/contact.html:98 msgid "" @@ -649,7 +660,7 @@ msgstr "" #: templates/contact.html:104 msgid "Send us Mail" -msgstr "Напишите нам" +msgstr "Адрес" #: templates/download-android.html:12 msgid "Get Tor Browser for Android."

1 0

[translation/tor_outreach_md_completed] Update translations for tor_outreach_md_completed
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit b428e2010c60c9f83258d1af7f4b2fa4f4223fc4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:50:38 2019 +0000 Update translations for tor_outreach_md_completed --- tor-outreach2019-2020-fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md index ad995ebef..ad0a5dab1 100644 --- a/tor-outreach2019-2020-fr.md +++ b/tor-outreach2019-2020-fr.md @@ -84,7 +84,7 @@ Il trouva un miroir officiel du site Web pour télécharger le programme. Quand il ouvrit le **Navigateur Tor**, il suivit les indications pour les utilisateurs censurés et se connecta à un pont qui lui permit à nouveau d’accéder à Internet. -Avec le Navigateur Tor, Jean peut naviguer librement, en toute confidentialité, et contacter sa famille. +Avec le Navigateur Tor, Jean peut naviguer en toute liberté, en toute confidentialité, et contacter sa famille. ### Dans le monde entier, des utilisateurs censurés comptent sur le Navigateur Tor pour une façon gratuite, stable et non censurée d’accéder à Internet.

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit e0ff9a86bbeb996e8d884f13df10d439ca1636ec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:50:33 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md index ad995ebef..ad0a5dab1 100644 --- a/tor-outreach2019-2020-fr.md +++ b/tor-outreach2019-2020-fr.md @@ -84,7 +84,7 @@ Il trouva un miroir officiel du site Web pour télécharger le programme. Quand il ouvrit le **Navigateur Tor**, il suivit les indications pour les utilisateurs censurés et se connecta à un pont qui lui permit à nouveau d’accéder à Internet. -Avec le Navigateur Tor, Jean peut naviguer librement, en toute confidentialité, et contacter sa famille. +Avec le Navigateur Tor, Jean peut naviguer en toute liberté, en toute confidentialité, et contacter sa famille. ### Dans le monde entier, des utilisateurs censurés comptent sur le Navigateur Tor pour une façon gratuite, stable et non censurée d’accéder à Internet.

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit 2194bb7e0ac5faaf9bf6003f570db6e63c9e2e43 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:50:10 2019 +0000 Update translations for torcheck_completed --- fr/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 7729ea28f..96ebb5bd0 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-26 17:41+0000\n" +"PO-Revision-Date: 2019-04-30 14:37+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Pour plus d’informations sur ce relais de sortie, voir :" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "Le Projet Tor est un organisme états-unien sans but lucratif 501(c)(3) dédié à la recherche, au développement et à l’éducation au sujet de l’anonymat et de la protection des données personnelles en ligne." +msgstr "Le Projet Tor est un organisme états-unien sans but lucratif 501(c)(3) qui se consacre à la recherche, au développement et à l’éducation au sujet de l’anonymat, de la vie privée et de la protection des données personnelles en ligne." msgid "Learn More »" msgstr "En apprendre davatange »"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit b4e79126d943a61b919cac96f106d0dfcee5eabe Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 14:50:04 2019 +0000 Update translations for torcheck --- fr/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 7729ea28f..96ebb5bd0 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-26 17:41+0000\n" +"PO-Revision-Date: 2019-04-30 14:37+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Pour plus d’informations sur ce relais de sortie, voir :" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "Le Projet Tor est un organisme états-unien sans but lucratif 501(c)(3) dédié à la recherche, au développement et à l’éducation au sujet de l’anonymat et de la protection des données personnelles en ligne." +msgstr "Le Projet Tor est un organisme états-unien sans but lucratif 501(c)(3) qui se consacre à la recherche, au développement et à l’éducation au sujet de l’anonymat, de la vie privée et de la protection des données personnelles en ligne." msgid "Learn More »" msgstr "En apprendre davatange »"

1 0