From: Lutz Jänicke <jaenicke@openssl.org>
Date: Tue, 9 Jan 2001 10:58:36 +0000 (+0000)
Subject: Don't cheat: when only getting several bytes from each source, n is incremented
X-Git-Tag: OpenSSL_0_9_6a-beta1~81^2~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28e5428d5df083c6015be5abc88959ee2e662eb6;p=oweals%2Fopenssl.git

Don't cheat: when only getting several bytes from each source, n is incremented
correctly, but RAND_add(..,n) counts the increasing n several times.
Only RAND_add(..,n) once entropy collection is finished.
---

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index c4aae38f1d..658d35f81c 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -183,10 +183,13 @@ int RAND_poll(void)
 				&& t.tv_usec != 0 && n < ENTROPY_NEEDED);
 
 			close(fd);
-			RAND_add(tmpbuf,sizeof tmpbuf,n);
-			memset(tmpbuf,0,n);
 			}
 		}
+	if (n > 0)
+		{
+		RAND_add(tmpbuf,sizeof tmpbuf,n);
+		memset(tmpbuf,0,n);
+		}
 #endif
 
 	/* put in some default random data, we need more than just this */