[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  69a978d35984bb27af336cffc252bdde51d36adb (commit)
      from  afc901e0ec53cd98618ade030b67a1ff8337d9dd (commit)


- Log -----------------------------------------------------------------
commit 69a978d35984bb27af336cffc252bdde51d36adb
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Aug 6 14:05:21 2017 +0100

    Use passed drbg, not global one
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/4097)

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

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

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 79b2cce..e76ca27 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -117,7 +117,7 @@ size_t drbg_entropy_from_system(RAND_DRBG *drbg,
         min_len = drbg->size;
     }
 
-    if (rand_drbg.filled) {
+    if (drbg->filled) {
         /* Re-use what we have. */
         *pout = drbg->randomness;
         return drbg->size;
@@ -136,7 +136,7 @@ size_t drbg_entropy_from_system(RAND_DRBG *drbg,
         min_len = rand_bytes.curr;
     if (min_len != 0) {
         memcpy(drbg->randomness, rand_bytes.buff, min_len);
-        rand_drbg.filled = 1;
+        drbg->filled = 1;
         /* Update amount left and shift it down. */
         rand_bytes.curr -= min_len;
         if (rand_bytes.curr != 0)