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

[tor/maint-0.3.2] Tweaks to strings in 24500
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 779e4b9dcf850770a7c30104f714f4a59c2955a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 5 12:09:57 2017 -0500 Tweaks to strings in 24500 --- changes/ticket24500 | 4 ++-- src/common/crypto.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changes/ticket24500 b/changes/ticket24500 index 0f1778d46..b49b7a555 100644 --- a/changes/ticket24500 +++ b/changes/ticket24500 @@ -1,3 +1,3 @@ - o Code simplification and refactoring: - - Making more useful log messages for errno errors on getrandom() call. + o Minor features (logging): + - Provide better warnings when the getrandom() syscall fails. Closes ticket 24500. diff --git a/src/common/crypto.c b/src/common/crypto.c index 7f034ee94..380f038f4 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2877,12 +2877,12 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) /* Useful log message for errno. */ if (errno == ENOSYS) { - log_warn(LD_CRYPTO, "This warning is caused by ENOSYS error." + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). " " You are running a version of Tor built to support" - " getrandom(), but the kernel is too old and doesn't" - " implement this function."); + " getrandom(), but the kernel doesn't implement this" + " implement this function--probably because it is too old?"); } else { - log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). %s error.", + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", strerror(errno)); }

1 0

[tor/master] Make errno error log more useful for getrandom()
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 313360e6e6aa6bc56e1bc3661b68df5279b6b4bc Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Tue Dec 5 00:17:09 2017 +0100 Make errno error log more useful for getrandom() Making errno error log more useful for getrandom() call. Adding if statement to make difference between ENOSYS and other errors. Fixes #24500 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- changes/ticket24500 | 3 +++ src/common/crypto.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/ticket24500 b/changes/ticket24500 new file mode 100644 index 000000000..0f1778d46 --- /dev/null +++ b/changes/ticket24500 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Making more useful log messages for errno errors on getrandom() call. + Closes ticket 24500. diff --git a/src/common/crypto.c b/src/common/crypto.c index 80137b0d8..7f034ee94 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2875,8 +2875,17 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) tor_assert(errno != EAGAIN); tor_assert(errno != EINTR); - /* Probably ENOSYS. */ - log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."); + /* Useful log message for errno. */ + if (errno == ENOSYS) { + log_warn(LD_CRYPTO, "This warning is caused by ENOSYS error." + " You are running a version of Tor built to support" + " getrandom(), but the kernel is too old and doesn't" + " implement this function."); + } else { + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). %s error.", + strerror(errno)); + } + getrandom_works = 0; /* Don't bother trying again. */ return -1; /* LCOV_EXCL_STOP */

1 0

[tor/release-0.3.2] Make errno error log more useful for getrandom()
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 313360e6e6aa6bc56e1bc3661b68df5279b6b4bc Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Tue Dec 5 00:17:09 2017 +0100 Make errno error log more useful for getrandom() Making errno error log more useful for getrandom() call. Adding if statement to make difference between ENOSYS and other errors. Fixes #24500 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- changes/ticket24500 | 3 +++ src/common/crypto.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/ticket24500 b/changes/ticket24500 new file mode 100644 index 000000000..0f1778d46 --- /dev/null +++ b/changes/ticket24500 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Making more useful log messages for errno errors on getrandom() call. + Closes ticket 24500. diff --git a/src/common/crypto.c b/src/common/crypto.c index 80137b0d8..7f034ee94 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2875,8 +2875,17 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) tor_assert(errno != EAGAIN); tor_assert(errno != EINTR); - /* Probably ENOSYS. */ - log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."); + /* Useful log message for errno. */ + if (errno == ENOSYS) { + log_warn(LD_CRYPTO, "This warning is caused by ENOSYS error." + " You are running a version of Tor built to support" + " getrandom(), but the kernel is too old and doesn't" + " implement this function."); + } else { + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). %s error.", + strerror(errno)); + } + getrandom_works = 0; /* Don't bother trying again. */ return -1; /* LCOV_EXCL_STOP */

1 0

[tor/release-0.3.2] Tweaks to strings in 24500
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 779e4b9dcf850770a7c30104f714f4a59c2955a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 5 12:09:57 2017 -0500 Tweaks to strings in 24500 --- changes/ticket24500 | 4 ++-- src/common/crypto.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changes/ticket24500 b/changes/ticket24500 index 0f1778d46..b49b7a555 100644 --- a/changes/ticket24500 +++ b/changes/ticket24500 @@ -1,3 +1,3 @@ - o Code simplification and refactoring: - - Making more useful log messages for errno errors on getrandom() call. + o Minor features (logging): + - Provide better warnings when the getrandom() syscall fails. Closes ticket 24500. diff --git a/src/common/crypto.c b/src/common/crypto.c index 7f034ee94..380f038f4 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2877,12 +2877,12 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) /* Useful log message for errno. */ if (errno == ENOSYS) { - log_warn(LD_CRYPTO, "This warning is caused by ENOSYS error." + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). " " You are running a version of Tor built to support" - " getrandom(), but the kernel is too old and doesn't" - " implement this function."); + " getrandom(), but the kernel doesn't implement this" + " implement this function--probably because it is too old?"); } else { - log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). %s error.", + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", strerror(errno)); }

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit a798ba6e9bd5ef7fed89948ffa0e7334ceb1844e Merge: 5822496d6 779e4b9dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 5 12:10:06 2017 -0500 Merge branch 'maint-0.3.2' changes/ticket24500 | 3 +++ src/common/crypto.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

[tor/master] Tweaks to strings in 24500
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 779e4b9dcf850770a7c30104f714f4a59c2955a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 5 12:09:57 2017 -0500 Tweaks to strings in 24500 --- changes/ticket24500 | 4 ++-- src/common/crypto.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changes/ticket24500 b/changes/ticket24500 index 0f1778d46..b49b7a555 100644 --- a/changes/ticket24500 +++ b/changes/ticket24500 @@ -1,3 +1,3 @@ - o Code simplification and refactoring: - - Making more useful log messages for errno errors on getrandom() call. + o Minor features (logging): + - Provide better warnings when the getrandom() syscall fails. Closes ticket 24500. diff --git a/src/common/crypto.c b/src/common/crypto.c index 7f034ee94..380f038f4 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2877,12 +2877,12 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) /* Useful log message for errno. */ if (errno == ENOSYS) { - log_warn(LD_CRYPTO, "This warning is caused by ENOSYS error." + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). " " You are running a version of Tor built to support" - " getrandom(), but the kernel is too old and doesn't" - " implement this function."); + " getrandom(), but the kernel doesn't implement this" + " implement this function--probably because it is too old?"); } else { - log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). %s error.", + log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", strerror(errno)); }

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 92d45086f5f82995fd179f27ab93bda7f80b50b8 Merge: bc30d3053 779e4b9dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 5 12:10:06 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24500 | 3 +++ src/common/crypto.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 05 Dec '17

05 Dec '17

commit c02c5a3909a65322365a7aa1b2ea352c81311e41 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 15:46:23 2017 +0000 Update translations for torbirdy_completed --- bg/torbirdy.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd index a023b4de9..f39e89152 100644 --- a/bg/torbirdy.dtd +++ b/bg/torbirdy.dtd @@ -38,6 +38,10 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Да не се поставя ID ключа на получателя в криптирани съобщения [по подразбиране: поставено]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Деактивиране на криптирането на хедърите на имейла [по подразбиране: активирано]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Деактивиране на криптирането на хедърите на имейла [по подразбиране: активирано]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Потвърдете, преди да изпратите е-поща, ако Enigmail е активиран [по подразбиране: е непотвърдено]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Включване автоматично на съветника за конфигурация на е-поща на Thunderbird [по подразбиране: изключено]">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 05 Dec '17

05 Dec '17

commit ab39ea8d2fe07a9f76fc621dd88a457b000fbc83 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 15:46:15 2017 +0000 Update translations for torbirdy --- bg/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd index 8f71b2d8d..f39e89152 100644 --- a/bg/torbirdy.dtd +++ b/bg/torbirdy.dtd @@ -38,9 +38,9 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Да не се поставя ID ключа на получателя в криптирани съобщения [по подразбиране: поставено]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Деактивиране на криптирането на хедърите на имейла [по подразбиране: активирано]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Деактивиране на криптирането на хедърите на имейла [по подразбиране: активирано]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Потвърдете, преди да изпратите е-поща, ако Enigmail е активиран [по подразбиране: е непотвърдено]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[torbirdy/master] Remove redundant translation string from torbirdy.dtd
by sukhbir＠torproject.org 05 Dec '17

05 Dec '17

commit 4f0f632165b2992beb6152a3b4589b6d80b27498 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Dec 5 09:32:58 2017 -0500 Remove redundant translation string from torbirdy.dtd --- chrome/locale/en/torbirdy.dtd | 2 -- 1 file changed, 2 deletions(-) diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index 232f04b..c88803a 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -40,8 +40,6 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> -<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">

1 0