diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-10 09:02:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-10 09:02:10 -0500 |
| commit | 7186e2a94361e29188ba43837e244683ce7fbf04 (patch) | |
| tree | 7a2812d5dd3d609b575b0667c8974a385a0137f9 /src/ext | |
| parent | 7e7188cb00d02a52baee1a26b548cd5eebd85ce7 (diff) | |
| parent | 3843c6615c7f62606973fef9068bbb7be58ff243 (diff) | |
| download | tor-7186e2a94361e29188ba43837e244683ce7fbf04.tar.gz tor-7186e2a94361e29188ba43837e244683ce7fbf04.zip | |
Merge remote-tracking branch 'public/feature17694_strongest_027'
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/ed25519/donna/ed25519_tor.c | 3 | ||||
| -rw-r--r-- | src/ext/ed25519/ref10/randombytes.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index 12493f7d14..ac726ba045 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 fc709fcefc..8bf31631f0 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) |