diff options
| author | Pauli <pauli@openssl.org> | 2023-04-27 11:25:11 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-05-03 07:51:21 +1000 |
| commit | 56547da9d3fa24f54b439497d322b12beb004c80 (patch) | |
| tree | d33efcf07dac8a1226b97ae114ee743a93648e95 | |
| parent | 4f373a9773efa63fdb73f3972f13ab78b9342b70 (diff) | |
| download | openssl-new-56547da9d3fa24f54b439497d322b12beb004c80.tar.gz | |
rand: trust user supplied entropy when configured without a random source
Fixes #20841
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/20843)
| -rw-r--r-- | crypto/rand/rand_lib.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index ce95bf6210..0cdb9caa6d 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -273,7 +273,13 @@ void RAND_add(const void *buf, int num, double randomness) # endif drbg = RAND_get0_primary(NULL); if (drbg != NULL && num > 0) +# ifdef OPENSSL_RAND_SEED_NONE + /* Without an entropy source, we have to rely on the user */ + EVP_RAND_reseed(drbg, 0, buf, num, NULL, 0); +# else + /* With an entropy source, we downgrade this to additional input */ EVP_RAND_reseed(drbg, 0, NULL, 0, buf, num); +# endif } # if !defined(OPENSSL_NO_DEPRECATED_1_1_0) |