diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-06-10 08:37:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-06-10 08:37:34 -0400 |
| commit | e2d01aac9e2f45f2c8f0de057f3104d6cfcdaa80 (patch) | |
| tree | 84ff10ed2942f6c3187cd833b52de98585741d42 | |
| parent | d60f8fe98a59ce13809e65de67e53b3dcf6199f0 (diff) | |
| parent | 7c19a4d924120f42c224ea357b388b73d05c2d89 (diff) | |
| download | tor-e2d01aac9e2f45f2c8f0de057f3104d6cfcdaa80.tar.gz tor-e2d01aac9e2f45f2c8f0de057f3104d6cfcdaa80.zip | |
Merge branch 'maint-0.4.4' into maint-0.4.5
| -rw-r--r-- | changes/ticket40390 | 8 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rand.c | 4 |
2 files changed, 10 insertions, 2 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 ac5f10da64..ce6f21dbb4 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -525,8 +525,8 @@ 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); -#endif /* defined(ENABLE_NSS) */ + tor_assert(r == 1); +#endif } /** |