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

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 7a7b1f9fa7f53f4092e0cc9fc21245a1ba590d1a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 18:15:55 2015 +0000 Update translations for abouttor-homepage_completed --- de/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 99e59b2..1539814 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Über Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ALLERDINGS, ist dieser Browser ist nicht mehr aktuell."> +<!ENTITY aboutTor.outOfDateTorOn.label "WARNUNG: Dieser Browser ist nicht mehr aktuell!"> <!ENTITY aboutTor.outOfDateTorOff.label "AUSSERDEM, dieser Browser ist nicht aktuell."> <!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung."> <!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen"> -<!ENTITY aboutTor.success.label "Herzlichen Glückwunsch!"> -<!ENTITY aboutTor.success2.label "Dieser Browser ist für die Benutzung von Tor eingestellt."> +<!ENTITY aboutTor.success.label "Willkommen im Tor Browser"> +<!ENTITY aboutTor.success2.label "Mit dem Tor-Netzwerk verbunden."> <!ENTITY aboutTor.success3.label "Sie können jetzt anonym im Internet surfen."> <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!"> <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 0f709a18cc124ce05510b526dc3e0f425fa42e8f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 18:15:51 2015 +0000 Update translations for abouttor-homepage --- de/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index bdc8b08..1539814 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Über Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "WARNUNG: Dieser Browser ist nicht mehr aktuell!"> <!ENTITY aboutTor.outOfDateTorOff.label "AUSSERDEM, dieser Browser ist nicht aktuell."> <!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung."> <!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Willkommen im Tor Browser"> +<!ENTITY aboutTor.success2.label "Mit dem Tor-Netzwerk verbunden."> <!ENTITY aboutTor.success3.label "Sie können jetzt anonym im Internet surfen."> <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!"> <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht.">

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit b4fd2be8cbc5defca0eaf6d52f481803d2b008af Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 18:15:37 2015 +0000 Update translations for mat-gui_completed --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2b961b7..2d01027 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-11-09 01:25+0000\n" -"Last-Translator: Danton Medrado\n" +"PO-Revision-Date: 2015-12-08 18:05+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ msgstr "" #: mat-gui:62 mat-gui:407 mat-gui:430 msgid "Ready" -msgstr "Pronto/a" +msgstr "Pronto" #: mat-gui:129 msgid "Choose files"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit d8b9a1644e1f3f444374842a9983fafbf2ce093d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 18:15:33 2015 +0000 Update translations for mat-gui --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2b961b7..2d01027 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-11-09 01:25+0000\n" -"Last-Translator: Danton Medrado\n" +"PO-Revision-Date: 2015-12-08 18:05+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ msgstr "" #: mat-gui:62 mat-gui:407 mat-gui:430 msgid "Ready" -msgstr "Pronto/a" +msgstr "Pronto" #: mat-gui:129 msgid "Choose files"

1 0

[tor/master] Fix comment switcheroo. Spotted by skruffy
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b701b7962b256ad7c4c43ad191a8ee094613af11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 12:53:51 2015 -0500 Fix comment switcheroo. Spotted by skruffy --- src/common/crypto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 5d8b45e..c0e118c 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2351,7 +2351,7 @@ crypto_seed_weak_rng(tor_weak_rng_t *rng) } /** Try to get out_len bytes of the strongest entropy we can generate, - * via system calls, storing it into out. Return -1 on success, 0 on + * via system calls, storing it into out. Return 0 on success, -1 on * failure. A maximum request size of 256 bytes is imposed. */ static int @@ -2434,7 +2434,7 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) /** Try to get out_len bytes of the strongest entropy we can generate, * via the per-platform fallback mechanism, storing it into out. - * Return -1 on success, 0 on failure. A maximum request size of 256 bytes + * Return 0 on success, -1 on failure. A maximum request size of 256 bytes * is imposed. */ static int @@ -2472,7 +2472,7 @@ crypto_strongest_rand_fallback(uint8_t *out, size_t out_len) } /** Try to get out_len bytes of the strongest entropy we can generate, - * storing it into out. Return -1 on success, 0 on failure. A maximum + * storing it into out. Return 0 on success, -1 on failure. A maximum * request size of 256 bytes is imposed. */ int

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit e6dfacbf414b98cf83e96c2a3fe314a9e4586ec9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 17:45:46 2015 +0000 Update translations for abouttor-homepage_completed --- nb/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index ee3ccbe..a86e4c7 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "MEN, denne nettleseren er utdatert."> +<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne nettleseren er utdatert."> <!ENTITY aboutTor.outOfDateTorOff.label "OGSÅ, denne nettleseren er utdatert."> <!ENTITY aboutTor.outOfDate2.label "Klikk på løken og velg 'Se etter oppdatering for TOR nettleser...'"> <!ENTITY aboutTor.check.label "Test Tors nettverksinnstillinger"> -<!ENTITY aboutTor.success.label "Gratulerer!"> -<!ENTITY aboutTor.success2.label "Denne nettleseren er konfigurert til å bruke Tor."> +<!ENTITY aboutTor.success.label "Velkommen til Tor nettleser"> +<!ENTITY aboutTor.success2.label "Tilkoblet Tor-nettverket."> <!ENTITY aboutTor.success3.label "Nå kan du surfe anonymt på internett."> <!ENTITY aboutTor.failure.label "Noe gikk galt!"> <!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 5920f2684711839cfc676fb11781d13397b4eb26 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 17:45:42 2015 +0000 Update translations for abouttor-homepage --- nb/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index 65ae5c4..a86e4c7 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne nettleseren er utdatert."> <!ENTITY aboutTor.outOfDateTorOff.label "OGSÅ, denne nettleseren er utdatert."> <!ENTITY aboutTor.outOfDate2.label "Klikk på løken og velg 'Se etter oppdatering for TOR nettleser...'"> <!ENTITY aboutTor.check.label "Test Tors nettverksinnstillinger"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Velkommen til Tor nettleser"> +<!ENTITY aboutTor.success2.label "Tilkoblet Tor-nettverket."> <!ENTITY aboutTor.success3.label "Nå kan du surfe anonymt på internett."> <!ENTITY aboutTor.failure.label "Noe gikk galt!"> <!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">

1 0

[tor/master] Fix spaces.
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 9ce431f03229e723f6a41412818fcb44108d9589 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 12:37:36 2015 -0500 Fix spaces. --- src/test/test_tortls.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 94d74c3..b4a3435 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -2589,7 +2589,6 @@ fixed_crypto_pk_get_evp_pkey_(crypto_pk_t *env, int private) fixed_crypto_pk_get_evp_pkey_result_index++]; } - static void test_tortls_create_certificate(void *ignored) {

1 0

[tor/master] Merge branch 'feature13696_squashed'
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 7f074e08d87c4119008c2b7b9689971f00e5edf8 Merge: 252149e 353c715 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 12:35:26 2015 -0500 Merge branch 'feature13696_squashed' changes/feature13696 | 3 ++ configure.ac | 2 + src/common/crypto.c | 146 +++++++++++++++++++++++++++++++++++++++++++++----- src/common/sandbox.c | 4 ++ 4 files changed, 142 insertions(+), 13 deletions(-)

1 0

[tor/master] Add support for getrandom() and getentropy() when available
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 353c71516e80f41dbb97da00ddfc528ec5ce3c40 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Nov 26 15:21:50 2015 +0000 Add support for getrandom() and getentropy() when available Implements feature #13696. --- changes/feature13696 | 3 ++ configure.ac | 2 + src/common/crypto.c | 146 +++++++++++++++++++++++++++++++++++++++++++++----- src/common/sandbox.c | 4 ++ 4 files changed, 142 insertions(+), 13 deletions(-) diff --git a/changes/feature13696 b/changes/feature13696 new file mode 100644 index 0000000..21c2188 --- /dev/null +++ b/changes/feature13696 @@ -0,0 +1,3 @@ + o Minor features (security, cryptography): + - Use modern system calls to generate strong entropy on platforms that + provide them. Closes ticket 13696. diff --git a/configure.ac b/configure.ac index 0530d77..b14361f 100644 --- a/configure.ac +++ b/configure.ac @@ -384,6 +384,7 @@ AC_CHECK_FUNCS( flock \ ftime \ getaddrinfo \ + getentropy \ getifaddrs \ getpass \ getrlimit \ @@ -951,6 +952,7 @@ AC_CHECK_HEADERS( sys/select.h \ sys/socket.h \ sys/statvfs.h \ + sys/syscall.h \ sys/sysctl.h \ sys/syslimits.h \ sys/time.h \ diff --git a/src/common/crypto.c b/src/common/crypto.c index baef755..5d8b45e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -43,6 +43,7 @@ #include <ctype.h> #endif #ifdef HAVE_UNISTD_H +#define _GNU_SOURCE #include <unistd.h> #endif #ifdef HAVE_FCNTL_H @@ -51,6 +52,9 @@ #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #include "torlog.h" #include "aes.h" @@ -68,6 +72,9 @@ /** Longest recognized */ #define MAX_DNS_LABEL_SIZE 63 +/** Largest strong entropy request */ +#define MAX_STRONGEST_RAND_SIZE 256 + /** Macro: is k a valid RSA public or private key? */ #define PUBLIC_KEY_OK(k) ((k) && (k)->key && (k)->key->n) /** Macro: is k a valid RSA private key? */ @@ -2344,23 +2351,18 @@ crypto_seed_weak_rng(tor_weak_rng_t *rng) } /** Try to get out_len bytes of the strongest entropy we can generate, - * storing it into out. Return -1 on success, 0 on failure. + * via system calls, storing it into out. Return -1 on success, 0 on + * failure. A maximum request size of 256 bytes is imposed. */ -int -crypto_strongest_rand(uint8_t *out, size_t out_len) +static int +crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) { -#ifdef _WIN32 + tor_assert(out_len <= MAX_STRONGEST_RAND_SIZE); + +#if defined(_WIN32) static int provider_set = 0; static HCRYPTPROV provider; -#else - static const char *filenames[] = { - "/dev/srandom", "/dev/urandom", "/dev/random", NULL - }; - int fd, i; - size_t n; -#endif -#ifdef _WIN32 if (!provider_set) { if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { @@ -2375,7 +2377,79 @@ crypto_strongest_rand(uint8_t *out, size_t out_len) } return 0; +#elif defined(__linux__) && defined(SYS_getrandom) + static int getrandom_works = 1; /* Be optimitic about our chances... */ + + /* getrandom() isn't as straight foward as getentropy(), and has + * no glibc wrapper. + * + * As far as I can tell from getrandom(2) and the source code, the + * requests we issue will always succeed (though it will block on the + * call if /dev/urandom isn't seeded yet), since we are NOT specifying + * GRND_NONBLOCK and the request is <= 256 bytes. + * + * The manpage is unclear on what happens if a signal interrupts the call + * while the request is blocked due to lack of entropy.... + * + * We optimistically assume that getrandom() is available and functional + * because it is the way of the future, and 2 branch mispredicts pale in + * comparision to the overheads involved with failing to open + * /dev/srandom followed by opening and reading from /dev/urandom. + */ + if (PREDICT_LIKELY(getrandom_works)) { + int ret; + do { + /* A flag of '0' here means to read from '/dev/urandom', and to + * block if insufficient entropy is available to service the + * request. + */ + ret = syscall(SYS_getrandom, out, out_len, 0); + } while (ret == -1 && ((errno == EINTR) ||(errno == EAGAIN))); + + if (PREDICT_UNLIKELY(ret == -1)) { + tor_assert(errno != EAGAIN); + tor_assert(errno != EINTR); + + /* Probably ENOSYS. */ + log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."); + getrandom_works = 0; /* Don't bother trying again. */ + return -1; + } + + tor_assert(ret == (int)out_len); + return 0; + } + + return -1; /* getrandom() previously failed unexpectedly. */ +#elif defined(HAVE_GETENTROPY) + /* getentropy() is what Linux's getrandom() wants to be when it grows up. + * the only gotcha is that requests are limited to 256 bytes. + */ + return getentropy(out, out_len); +#endif + + /* This platform doesn't have a supported syscall based random. */ + return -1; +} + +/** Try to get out_len bytes of the strongest entropy we can generate, + * via the per-platform fallback mechanism, storing it into out. + * Return -1 on success, 0 on failure. A maximum request size of 256 bytes + * is imposed. + */ +static int +crypto_strongest_rand_fallback(uint8_t *out, size_t out_len) +{ +#ifdef _WIN32 + /* Windows exclusively uses crypto_strongest_rand_syscall(). */ + return -1; #else + static const char *filenames[] = { + "/dev/srandom", "/dev/urandom", "/dev/random", NULL + }; + int fd, i; + size_t n; + for (i = 0; filenames[i]; ++i) { log_debug(LD_FS, "Opening %s for entropy", filenames[i]); fd = open(sandbox_intern_string(filenames[i]), O_RDONLY, 0); @@ -2393,11 +2467,57 @@ crypto_strongest_rand(uint8_t *out, size_t out_len) return 0; } - log_warn(LD_CRYPTO, "Cannot get strong entropy: no entropy source found."); return -1; #endif } +/** Try to get out_len bytes of the strongest entropy we can generate, + * storing it into out. Return -1 on success, 0 on failure. A maximum + * request size of 256 bytes is imposed. + */ +int +crypto_strongest_rand(uint8_t *out, size_t out_len) +{ + static const size_t sanity_min_size = 16; + static const int max_attempts = 3; + tor_assert(out_len <= MAX_STRONGEST_RAND_SIZE); + + /* For buffers >= 16 bytes (128 bits), we sanity check the output by + * zero filling the buffer and ensuring that it actually was at least + * partially modified. + * + * Checking that any individual byte is non-zero seems like it would + * fail too often (p = out_len * 1/256) for comfort, but this is an + * "adjust according to taste" sort of check. + */ + memwipe(out, 0, out_len); + for (int i = 0; i < max_attempts; i++) { + /* Try to use the syscall/OS favored mechanism to get strong entropy. */ + if (crypto_strongest_rand_syscall(out, out_len) != 0) { + /* Try to use the less-favored mechanism to get strong entropy. */ + if (crypto_strongest_rand_fallback(out, out_len) != 0) { + /* Welp, we tried. Hopefully the calling code terminates the process + * since we're basically boned without good entropy. + */ + log_warn(LD_CRYPTO, + "Cannot get strong entropy: no entropy source found."); + return -1; + } + } + + if ((out_len < sanity_min_size) || !tor_mem_is_zero((char*)out, out_len)) + return 0; + } + + /* We tried max_attempts times to fill a buffer >= 128 bits long, + * and each time it returned all '0's. Either the system entropy + * source is busted, or the user should go out and buy a ticket to + * every lottery on the planet. + */ + log_warn(LD_CRYPTO, "Strong OS entropy returned all zero buffer."); + return -1; +} + /** Seed OpenSSL's random number generator with bytes from the operating * system. Return 0 on success, -1 on failure. */ diff --git a/src/common/sandbox.c b/src/common/sandbox.c index b995762..8198858 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -199,6 +199,10 @@ static int filter_nopar_gen[] = { SCMP_SYS(stat64), #endif +#ifdef __NR_getrandom + SCMP_SYS(getrandom), +#endif + /* * These socket syscalls are not required on x86_64 and not supported with * some libseccomp versions (eg: 1.0.1)

1 0