From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 5 Aug 2017 10:19:27 +0000 (+0100)
Subject: Set randomness buffer pointer in get_entropy calls.
X-Git-Tag: OpenSSL_1_1_1-pre1~895
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78632b6633cf8af21a4fba2091f3e771e3ab40fb;p=oweals%2Fopenssl.git

Set randomness buffer pointer in get_entropy calls.

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/4092)
---

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index d6cb717489..79b2cce249 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -143,6 +143,7 @@ size_t drbg_entropy_from_system(RAND_DRBG *drbg,
             memmove(rand_bytes.buff, &rand_bytes.buff[min_len], rand_bytes.curr);
     }
     CRYPTO_THREAD_unlock(rand_bytes.lock);
+    *pout = drbg->randomness;
     return min_len;
 }
 
@@ -163,6 +164,7 @@ size_t drbg_entropy_from_parent(RAND_DRBG *drbg,
     if (st == 0)
         return 0;
     drbg->filled = 1;
+    *pout = drbg->randomness;
     return min_len;
 }