diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-06-10 08:32:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-06-10 08:32:12 -0400 |
| commit | c5922244e27f72a0b974920d56475450932568ff (patch) | |
| tree | eb733c6fd5329100bc5743252d26e6c4fe5c3f77 | |
| parent | d6e2516031daa3e081ed7efdbd4e298fd4e7a290 (diff) | |
| parent | 9ceb2c317b7a4fe9777599971ef6a2f68e5e6c46 (diff) | |
| download | tor-c5922244e27f72a0b974920d56475450932568ff.tar.gz tor-c5922244e27f72a0b974920d56475450932568ff.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/ticket40390 | 8 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rand.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/ticket40390 b/changes/ticket40390 new file mode 100644 index 0000000000..b56fa4d9da --- /dev/null +++ b/changes/ticket40390 @@ -0,0 +1,8 @@ + o Major bugfixes (security, defense-in-depth): + - Detect a wider variety of failure conditions from the OpenSSL RNG + code. Previously, we would detect errors from a missing RNG + implementation, but not failures from the RNG code itself. + Fortunately, it appears those failures do not happen in practice + when Tor is using OpenSSL's default RNG implementation. + Fixes bug 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as + TROVE-2021-004. Reported by Jann Horn at Google's Project Zero. diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 915fe0870d..206929d6b3 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -525,7 +525,7 @@ crypto_rand_unmocked(char *to, size_t n) /* We consider a PRNG failure non-survivable. Let's assert so that we get a * stack trace about where it happened. */ - tor_assert(r >= 0); + tor_assert(r == 1); #endif } |