[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  7c226dfc434dcd0c8a3240df166b7561a8b51b0f (commit)
      from  037241bf046be8cfc7e9216959393dd20b06fc21 (commit)


- Log -----------------------------------------------------------------
commit 7c226dfc434dcd0c8a3240df166b7561a8b51b0f
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Wed Jul 25 11:08:48 2018 +1000

    Fixed issue where DRBG_CTR fails if NO_DF is used - when entropy is called
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6778)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index d31735c..6123d14 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);