From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 5 Aug 2017 11:04:10 +0000 (+0100)
Subject: Add entropy sanity check
X-Git-Tag: OpenSSL_1_1_1-pre1~894
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4c78ba5918daf7965759a720687c58d2ebb0eb1f;p=oweals%2Fopenssl.git

Add entropy sanity check

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

diff --git a/crypto/rand/drbg_rand.c b/crypto/rand/drbg_rand.c
index 06f8affeb8..934679e315 100644
--- a/crypto/rand/drbg_rand.c
+++ b/crypto/rand/drbg_rand.c
@@ -243,6 +243,9 @@ int ctr_instantiate(RAND_DRBG *drbg,
 {
     RAND_DRBG_CTR *ctr = &drbg->ctr;
 
+    if (ent == NULL)
+        return 0;
+
     memset(ctr->K, 0, sizeof(ctr->K));
     memset(ctr->V, 0, sizeof(ctr->V));
     AES_set_encrypt_key(ctr->K, drbg->strength, &ctr->ks);
@@ -254,6 +257,8 @@ int ctr_reseed(RAND_DRBG *drbg,
                const unsigned char *ent, size_t entlen,
                const unsigned char *adin, size_t adinlen)
 {
+    if (ent == NULL)
+        return 0;
     ctr_update(drbg, ent, entlen, adin, adinlen, NULL, 0);
     return 1;
 }