From 5520695c733f7e6577a8b06e5ed3e34aa48df19a Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Thu, 30 May 2019 18:52:39 +0200 Subject: [PATCH] drbg: add fork id to additional data on UNIX systems Provides a little extra fork-safety on UNIX systems, adding to the fact that all DRBGs reseed automatically when the fork_id changes. Reviewed-by: Paul Dale Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9802) --- crypto/rand/rand_unix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 1f608c9565..0cfa4e0625 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -711,15 +711,18 @@ int rand_pool_add_nonce_data(RAND_POOL *pool) int rand_pool_add_additional_data(RAND_POOL *pool) { struct { + int fork_id; CRYPTO_THREAD_ID tid; uint64_t time; } data = { 0 }; /* * Add some noise from the thread id and a high resolution timer. + * The fork_id adds some extra fork-safety. * The thread id adds a little randomness if the drbg is accessed * concurrently (which is the case for the drbg). */ + data.fork_id = openssl_get_fork_id(); data.tid = CRYPTO_THREAD_get_current_id(); data.time = get_timer_bits(); -- 2.25.1