- tor-commits - lists.torproject.org

[tor/maint-0.2.7] bump maint version to 0.2.7.6
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit 7fb19f1ca86ef313f45886380daade684e35c525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 10:04:59 2015 -0500 bump maint version to 0.2.7.6 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3236a81..6c72971 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.5-dev]) +AC_INIT([tor],[0.2.7.6]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8932c82..07cc315 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.7.5-dev" +!define VERSION "0.2.7.6" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 11b5546..822e261 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.5-dev" +#define VERSION "0.2.7.6"

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit f01f8e18b80b195f49cb48561b85f6eaae85e8cb Merge: 6f3f753 7fb19f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 10:05:08 2015 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.7] bump maint version to 0.2.7.6
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit 7fb19f1ca86ef313f45886380daade684e35c525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 10:04:59 2015 -0500 bump maint version to 0.2.7.6 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3236a81..6c72971 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.5-dev]) +AC_INIT([tor],[0.2.7.6]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8932c82..07cc315 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.7.5-dev" +!define VERSION "0.2.7.6" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 11b5546..822e261 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.5-dev" +#define VERSION "0.2.7.6"

1 0

[tor/master] Remove already-merged changes files.
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit 81c06b132f0aafa7899a4a2c52e1ba96f5abe19d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 10:00:56 2015 -0500 Remove already-merged changes files. --- changes/bug16056 | 4 ---- changes/bug16702 | 4 ---- changes/bug17364 | 3 --- changes/bug17551 | 4 ---- changes/bug17722 | 3 --- changes/bug17772 | 7 ------- changes/bug17781 | 3 --- changes/geoip-december2015 | 4 ---- 8 files changed, 32 deletions(-) diff --git a/changes/bug16056 b/changes/bug16056 deleted file mode 100644 index e3311c0..0000000 --- a/changes/bug16056 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (relay, IPv6): - - When displaying an IPv6 exit policy, include the mask bits correctly - even when the number is greater than 31. Fixes bug 16056; bugfix on - 0.2.4.7-alpha. Patch from "gturner". \ No newline at end of file diff --git a/changes/bug16702 b/changes/bug16702 deleted file mode 100644 index 5de36cd..0000000 --- a/changes/bug16702 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden service) - - The wrong list was used when looking up expired intro points in a rend - service object causing what we think could be reachability issues and - triggering a BUG log. Fixes 16702; bugfix on tor-0.2.7.2-alpha. diff --git a/changes/bug17364 b/changes/bug17364 deleted file mode 100644 index dd9ff12..0000000 --- a/changes/bug17364 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Note that HiddenServicePorts can take a unix domain socket. - Closes ticket 17364. diff --git a/changes/bug17551 b/changes/bug17551 deleted file mode 100644 index 27e4679..0000000 --- a/changes/bug17551 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - When checking for net/pfvar.h, include netinet/in.h if possible. - This fixes transparent proxy detection on OpenBSD. Fixes bug - 17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate". diff --git a/changes/bug17722 b/changes/bug17722 deleted file mode 100644 index 1b18d4a..0000000 --- a/changes/bug17722 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (code correctness) - - Fix undefined behavior in the tor_cert_checksig function. Fixes bug - 17722; bugfix on tor-0.2.7.2-alpha. diff --git a/changes/bug17772 b/changes/bug17772 deleted file mode 100644 index 54d457c..0000000 --- a/changes/bug17772 +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (guard selection): - - Actually look at the Guard flag when selecting a new directory - guard. When we implemented the directory guard design, we - accidentally started treating all relays as if they have the Guard - flag during guard selection, leading to weaker anonymity and worse - performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered - by Mohsen Imani. diff --git a/changes/bug17781 b/changes/bug17781 deleted file mode 100644 index 01ed231..0000000 --- a/changes/bug17781 +++ /dev/null @@ -1,3 +0,0 @@ - o Compilation fixes: - - Fix a compilation warning with Clang 3.6: Do not check the - presence of an address which can never be NULL. Fixes bug 17781. diff --git a/changes/geoip-december2015 b/changes/geoip-december2015 deleted file mode 100644 index 597bcc9..0000000 --- a/changes/geoip-december2015 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2 - Country database. -

1 0

[tor/release-0.2.7] Reflow and sort the changelog.
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit 6f3f753c219e5ad2a48ef26d3bf5c42f02c49f1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 09:50:52 2015 -0500 Reflow and sort the changelog. --- ChangeLog | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9326673..44e9586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,16 +10,9 @@ Changes in version 0.2.7.6 - 2015-12-10 performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered by Mohsen Imani. - o Minor bugfixes (correctness): - - When displaying an IPv6 exit policy, include the mask bits correctly - even when the number is greater than 31. Fixes bug 16056; bugfix on - 0.2.4.7-alpha. Patch from "gturner". - - The wrong list was used when looking up expired intro points in - a rend service object, causing what we think could be reachability - issues for hidden services, and triggering a BUG log. Fixes bug - 16702; bugfix on 0.2.7.2-alpha. - - Fix undefined behavior in the tor_cert_checksig function. Fixes bug - 17722; bugfix on 0.2.7.2-alpha. + o Minor features (geoip): + - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2 + Country database. o Minor bugfixes (compilation): - When checking for net/pfvar.h, include netinet/in.h if possible. @@ -28,9 +21,16 @@ Changes in version 0.2.7.6 - 2015-12-10 - Fix a compilation warning with Clang 3.6: Do not check the presence of an address which can never be NULL. Fixes bug 17781. - o Minor features: - - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2 - Country database. + o Minor bugfixes (correctness): + - When displaying an IPv6 exit policy, include the mask bits + correctly even when the number is greater than 31. Fixes bug + 16056; bugfix on 0.2.4.7-alpha. Patch from "gturner". + - The wrong list was used when looking up expired intro points in a + rend service object, causing what we think could be reachability + issues for hidden services, and triggering a BUG log. Fixes bug + 16702; bugfix on 0.2.7.2-alpha. + - Fix undefined behavior in the tor_cert_checksig function. Fixes + bug 17722; bugfix on 0.2.7.2-alpha. Changes in version 0.2.7.5 - 2015-11-20

1 0

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

10 Dec '15

commit 3ab5f57518ab8a3e00c5f532c86e5680b7c0883e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 10 14:45:38 2015 +0000 Update translations for mat-gui_completed --- pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2d01027..4a1c2b1 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -15,7 +15,7 @@ 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-12-08 18:05+0000\n" +"PO-Revision-Date: 2015-12-10 14:22+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" @@ -38,7 +38,7 @@ msgstr "Todos os arquivos" #: mat-gui:143 msgid "Supported files" -msgstr "Arquivos suportados" +msgstr "Formatos de arquivo que possuem suporte" #: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428 #: data/mat.glade:172 @@ -100,7 +100,7 @@ msgstr "Formato de arquivo inofensivo" #: mat-gui:330 msgid "Fileformat not supported" -msgstr " Formato de arquivo sem suporte" +msgstr " Esse formato de arquivo não possui suporte" #: mat-gui:333 msgid "These files can not be processed:" @@ -125,7 +125,7 @@ msgstr "Incluir" #: mat-gui:382 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "O MAT não é capaz de limpar os seguintes arquivos encontrados no arquivo %s" +msgstr "MAT não é capaz de limpar os seguintes arquivos encontrados no arquivo %s" #: mat-gui:398 #, python-format

1 0

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

10 Dec '15

commit 62ce00c1441b13f5a15ae0ba2175e1ece42d880c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 10 14:45:34 2015 +0000 Update translations for mat-gui --- pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2d01027..4a1c2b1 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -15,7 +15,7 @@ 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-12-08 18:05+0000\n" +"PO-Revision-Date: 2015-12-10 14:22+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" @@ -38,7 +38,7 @@ msgstr "Todos os arquivos" #: mat-gui:143 msgid "Supported files" -msgstr "Arquivos suportados" +msgstr "Formatos de arquivo que possuem suporte" #: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428 #: data/mat.glade:172 @@ -100,7 +100,7 @@ msgstr "Formato de arquivo inofensivo" #: mat-gui:330 msgid "Fileformat not supported" -msgstr " Formato de arquivo sem suporte" +msgstr " Esse formato de arquivo não possui suporte" #: mat-gui:333 msgid "These files can not be processed:" @@ -125,7 +125,7 @@ msgstr "Incluir" #: mat-gui:382 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "O MAT não é capaz de limpar os seguintes arquivos encontrados no arquivo %s" +msgstr "MAT não é capaz de limpar os seguintes arquivos encontrados no arquivo %s" #: mat-gui:398 #, python-format

1 0

[tor/master] add a static
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit 390d3fa3af28825e152aadd244e3855d067179c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 09:43:55 2015 -0500 add a static --- src/common/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index ba5c8a7..3785074 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2480,7 +2480,7 @@ crypto_strongest_rand_fallback(uint8_t *out, size_t out_len) * storing it into out. Return 0 on success, -1 on failure. A maximum * request size of 256 bytes is imposed. */ -int +static int crypto_strongest_rand_raw(uint8_t *out, size_t out_len) { static const size_t sanity_min_size = 16;

1 0

[tor/master] improve a comment in memwipe
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit ce3b7ddb5494d51868bbaa1922f9bdb192907527 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 09:03:47 2015 -0500 improve a comment in memwipe --- src/common/crypto.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 816423a..ba5c8a7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2817,7 +2817,11 @@ memwipe(void *mem, uint8_t byte, size_t sz) * variable. It's an elaborate ruse to trick the compiler into not * optimizing out the "wipe this memory" code. Read it if you like zany * programming tricks! In later versions of Tor, we should look for better - * not-optimized-out memory wiping stuff. */ + * not-optimized-out memory wiping stuff... + * + * ...or maybe not. In practice, there are pure-asm implementations of + * OPENSSL_cleanse() on most platforms, which ought to do the job. + **/ OPENSSL_cleanse(mem, sz); /* Just in case some caller of memwipe() is relying on getting a buffer * filled with a particular value, fill the buffer.

1 0

[tor/master] Always hash crypto_strongest_rand() along with some prng
by nickm＠torproject.org 10 Dec '15

10 Dec '15

commit 2259de0de726f3f617b2451d64f72f0d4d6bc0ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:54:42 2015 -0500 Always hash crypto_strongest_rand() along with some prng (before using it for anything besides feeding the PRNG) Part of #17694 --- changes/bug17694_strongest | 6 +++++ src/common/crypto.c | 46 ++++++++++++++++++++++++++++++++--- src/common/crypto.h | 2 +- src/common/crypto_curve25519.c | 17 ++++--------- src/common/crypto_ed25519.c | 4 ++- src/ext/ed25519/donna/ed25519_tor.c | 3 +-- src/ext/ed25519/ref10/randombytes.h | 2 +- 7 files changed, 59 insertions(+), 21 deletions(-) diff --git a/changes/bug17694_strongest b/changes/bug17694_strongest new file mode 100644 index 0000000..0a8954a --- /dev/null +++ b/changes/bug17694_strongest @@ -0,0 +1,6 @@ + o Minor features (security): + - Never use the system entropy output directly for anything besides + seeding the PRNG. When we want to generate important keys, instead + of using system entropy directly, hash it with the PRNG stream. + This may help resist certain attacks based on broken OS entropy + implementations. Closes part of ticket 17694. \ No newline at end of file diff --git a/src/common/crypto.c b/src/common/crypto.c index 9669493..675fe7a 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2280,10 +2280,13 @@ 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. + * storing it into out. Return 0 on success, -1 on failure. + * + * (You should almost never call this directly unless you are seeding a PRNG; + * use crypto_strongest_rand() instead.) */ -int -crypto_strongest_rand(uint8_t *out, size_t out_len) +static int +crypto_strongest_rand_raw(uint8_t *out, size_t out_len) { #ifdef _WIN32 static int provider_set = 0; @@ -2334,6 +2337,41 @@ crypto_strongest_rand(uint8_t *out, size_t out_len) #endif } +/** Try to get out_len bytes of the strongest entropy we can generate, + * storing it into out. + */ +void +crypto_strongest_rand(uint8_t *out, size_t out_len) +{ + const unsigned DLEN = SHA512_DIGEST_LENGTH; + uint8_t inp[DLEN*2]; + uint8_t tmp[DLEN]; + tor_assert(out); + while (out_len) { + crypto_rand((char*) inp+DLEN, DLEN); + if (crypto_strongest_rand_raw(inp, DLEN) < 0) { + log_err(LD_CRYPTO, "Failed to load strong entropy when generating an " + "important key. Exiting."); + tor_assert(0); + } + if (out_len >= DLEN) { + SHA512(inp, sizeof(inp), out); + out += DLEN; + out_len -= DLEN; + } else { + SHA512(inp, sizeof(inp), tmp); + memcpy(out, tmp, out_len); + out += DLEN; + out_len -= DLEN; + break; + } + } + memwipe(tmp, 0, sizeof(tmp)); + memwipe(inp, 0, sizeof(inp)); + +} + + /** Seed OpenSSL's random number generator with bytes from the operating * system. startup should be true iff we have just started Tor and * have not yet allocated a bunch of fds. Return 0 on success, -1 on failure. @@ -2351,7 +2389,7 @@ crypto_seed_rng(void) if (rand_poll_ok == 0) log_warn(LD_CRYPTO, "RAND_poll() failed."); - load_entropy_ok = !crypto_strongest_rand(buf, sizeof(buf)); + load_entropy_ok = !crypto_strongest_rand_raw(buf, sizeof(buf)); if (load_entropy_ok) { RAND_seed(buf, sizeof(buf)); } diff --git a/src/common/crypto.h b/src/common/crypto.h index 3b471c2..1e0bbb4 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -262,7 +262,7 @@ int crypto_expand_key_material_rfc5869_sha256( int crypto_seed_rng(void) ATTR_WUR; MOCK_DECL(void,crypto_rand,(char *to, size_t n)); void crypto_rand_unmocked(char *to, size_t n); -int crypto_strongest_rand(uint8_t *out, size_t out_len); +void crypto_strongest_rand(uint8_t *out, size_t out_len); int crypto_rand_int(unsigned int max); int crypto_rand_int_range(unsigned int min, unsigned int max); uint64_t crypto_rand_uint64_range(uint64_t min, uint64_t max); diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 00302a2..2002483 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -111,18 +111,11 @@ curve25519_public_key_is_ok(const curve25519_public_key_t *key) int curve25519_rand_seckey_bytes(uint8_t *out, int extra_strong) { - uint8_t k_tmp[CURVE25519_SECKEY_LEN]; - - crypto_rand((char*)out, CURVE25519_SECKEY_LEN); - if (extra_strong && !crypto_strongest_rand(k_tmp, CURVE25519_SECKEY_LEN)) { - /* If they asked for extra-strong entropy and we have some, use it as an - * HMAC key to improve not-so-good entropy rather than using it directly, - * just in case the extra-strong entropy is less amazing than we hoped. */ - crypto_hmac_sha256((char*) out, - (const char *)k_tmp, sizeof(k_tmp), - (const char *)out, CURVE25519_SECKEY_LEN); - } - memwipe(k_tmp, 0, sizeof(k_tmp)); + if (extra_strong) + crypto_strongest_rand(out, CURVE25519_SECKEY_LEN); + else + crypto_rand((char*)out, CURVE25519_SECKEY_LEN); + return 0; } diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c index 1749efc..41ec486 100644 --- a/src/common/crypto_ed25519.c +++ b/src/common/crypto_ed25519.c @@ -107,7 +107,9 @@ ed25519_secret_key_generate(ed25519_secret_key_t *seckey_out, { int r; uint8_t seed[32]; - if (! extra_strong || crypto_strongest_rand(seed, sizeof(seed)) < 0) + if (extra_strong) + crypto_strongest_rand(seed, sizeof(seed)); + else crypto_rand((char*)seed, sizeof(seed)); r = get_ed_impl()->seckey_expand(seckey_out->seckey, seed); diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index 12493f7..ac726ba 100644 --- a/src/ext/ed25519/donna/ed25519_tor.c +++ b/src/ext/ed25519/donna/ed25519_tor.c @@ -148,8 +148,7 @@ ed25519_donna_seckey(unsigned char *sk) { ed25519_secret_key seed; - if (crypto_strongest_rand(seed, 32)) - return -1; + crypto_strongest_rand(seed, 32); ed25519_extsk(sk, seed); diff --git a/src/ext/ed25519/ref10/randombytes.h b/src/ext/ed25519/ref10/randombytes.h index fc709fc..8bf3163 100644 --- a/src/ext/ed25519/ref10/randombytes.h +++ b/src/ext/ed25519/ref10/randombytes.h @@ -1,4 +1,4 @@ /* Added for Tor. */ #include "crypto.h" #define randombytes(b, n) \ - (crypto_strongest_rand((b), (n))) + (crypto_strongest_rand((b), (n)), 0)

1 0