Merge branch 'maint-0.3.5' into maint-0.4.4

This commit is contained in:
Nick Mathewson 2021-06-10 08:37:26 -04:00
commit 7c19a4d924
2 changed files with 10 additions and 2 deletions

8
changes/ticket40390 Normal file
View File

@ -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.

View File

@ -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
}
/**