From bfe51d38951b6c110ab02280fa87dac9e81dda70 Mon Sep 17 00:00:00 2001
From: Pierre Joye <pajoye@php.net>
Date: Tue, 8 Jun 2010 13:46:19 +0000
Subject: [PATCH] - [DOC] add session.entropy* support to windows

---
 ext/session/session.c | 28 ++++++++++++++++++++++++++--
 php.ini-development   |  2 ++
 php.ini-production    |  2 ++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ext/session/session.c b/ext/session/session.c
index 289efa94932..843941a1dd3 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -26,9 +26,10 @@
 #include "php.h"
 
 #ifdef PHP_WIN32
-#include "win32/time.h"
+# include "win32/winutil.h"
+# include "win32/time.h"
 #else
-#include <sys/time.h>
+# include <sys/time.h>
 #endif
 
 #include <sys/stat.h>
@@ -328,6 +329,28 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
 	efree(buf);
 
 	if (PS(entropy_length) > 0) {
+		unsigned char rbuf[2048];
+
+#ifdef PHP_WIN32
+		size_t toread = PS(entropy_length);
+		__debugbreak();
+		if (php_win32_get_random_bytes(rbuf, (size_t) toread) == SUCCESS){
+
+			switch (PS(hash_func)) {
+				case PS_HASH_FUNC_MD5:
+					PHP_MD5Update(&md5_context, rbuf, toread);
+					break;
+				case PS_HASH_FUNC_SHA1:
+					PHP_SHA1Update(&sha1_context, rbuf, toread);
+					break;
+# if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
+				case PS_HASH_FUNC_OTHER:
+					PS(hash_ops)->hash_update(hash_context, rbuf, toread);
+					break;
+# endif /* HAVE_HASH_EXT */
+			}
+		}
+#else
 		int fd;
 
 		fd = VCWD_OPEN(PS(entropy_file), O_RDONLY);
@@ -357,6 +380,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
 			}
 			close(fd);
 		}
+#endif
 	}
 
 	digest = emalloc(digest_len + 1);
diff --git a/php.ini-development b/php.ini-development
index ab8091f5388..731715efaee 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1495,6 +1495,8 @@ session.referer_check =
 ; Defaults to /dev/urandom
 ; On systems that don't have /dev/urandom but do have /dev/arandom, this will default to /dev/arandom
 ; If neither are found at compile time, the default is no entropy file.
+; On windows, setting the entropy_length setting will activate the 
+; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
 
 ; http://php.net/session.entropy-length
diff --git a/php.ini-production b/php.ini-production
index 37e7aff7ff7..6a7748272a4 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1499,6 +1499,8 @@ session.referer_check =
 ; Defaults to /dev/urandom
 ; On systems that don't have /dev/urandom but do have /dev/arandom, this will default to /dev/arandom
 ; If neither are found at compile time, the default is no entropy file.
+; On windows, setting the entropy_length setting will activate the 
+; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom
 
 ; http://php.net/session.entropy-length