From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 6 Apr 2014 22:11:20 +0000 (+0100)
Subject: Return if ssleay_rand_add called with zero num.
X-Git-Tag: master-pre-reformat~818
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74fa33bcee6bc84f41442bdd256d838c2cb3c14;p=thirdparty%2Fopenssl.git

Return if ssleay_rand_add called with zero num.

Treat a zero length passed to ssleay_rand_add a no op: the existing logic
zeroes the md value which is very bad. OpenSSL itself never does this
internally and the actual call doesn't make sense as it would be passing
zero bytes of entropy.

Thanks to Marcus Meissner <meissner@suse.de> for reporting this bug.
(cherry picked from commit 5be1ae28ef3c4bdec95b94f14e0e939157be550a)
---

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 6cab3087bbe..67ac5ac9272 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -212,6 +212,9 @@ static int ssleay_rand_add(const void *buf, int num, double add)
 	int do_not_lock;
 	int rv = 0;
 
+	if (!num)
+		return;
+
 	/*
 	 * (Based on the rand(3) manpage)
 	 *