From: Shane Lontis <shane.lontis@oracle.com>
Date: Wed, 25 Jul 2018 01:08:48 +0000 (+1000)
Subject: Fixed issue where DRBG_CTR fails if NO_DF is used - when entropy is called
X-Git-Tag: OpenSSL_1_1_1-pre9~87
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c226dfc434dcd0c8a3240df166b7561a8b51b0f;p=oweals%2Fopenssl.git

Fixed issue where DRBG_CTR fails if NO_DF is used - when entropy is called

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/6778)
---

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index d31735c5c4..6123d148a4 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -174,7 +174,7 @@ size_t rand_drbg_get_entropy(RAND_DRBG *drbg,
             if (RAND_DRBG_generate(drbg->parent,
                                    buffer, bytes_needed,
                                    prediction_resistance,
-                                   (unsigned char *)drbg, sizeof(*drbg)) != 0)
+                                   NULL, 0) != 0)
                 bytes = bytes_needed;
             rand_drbg_unlock(drbg->parent);