From: Pierre Joye <pajoye@php.net>
Date: Wed, 3 Feb 2010 20:10:35 +0000 (+0000)
Subject: Worked with Samy Kamkar to improve LCG entropy.
X-Git-Tag: php-5.3.2RC2~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aca44dde048ba136a3b8b9637a19b7a2c9217514;p=php

Worked with Samy Kamkar to improve LCG entropy.
---

diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c
index ad9c4744f8..aa0adff2fb 100644
--- a/ext/standard/lcg.c
+++ b/ext/standard/lcg.c
@@ -78,7 +78,7 @@ static void lcg_seed(TSRMLS_D) /* {{{ */
 	struct timeval tv;
 
 	if (gettimeofday(&tv, NULL) == 0) {
-		LCG(s1) = tv.tv_sec ^ (~tv.tv_usec);
+		LCG(s1) = tv.tv_sec ^ (tv.tv_usec<<11);
 	} else {
 		LCG(s1) = 1;
 	}
@@ -88,6 +88,11 @@ static void lcg_seed(TSRMLS_D) /* {{{ */
 	LCG(s2) = (long) getpid();
 #endif
 
+	/* Add entropy to s2 by calling gettimeofday() again */
+	if (gettimeofday(&tv, NULL) == 0) {
+		LCG(s2) ^= (tv.tv_usec<<11);
+	}
+
 	LCG(seeded) = 1;
 }
 /* }}} */