diff options
| author | Pierre Joye <pajoye@php.net> | 2010-06-08 22:30:16 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-06-08 22:30:16 +0000 |
| commit | 9e5313fdcaf7257abcccc29b504effa07d08211b (patch) | |
| tree | d1c967525201b44bb23801d0ffcf73f2bf4c9804 /ext/session | |
| parent | 32447e490283216637ba174aa754749f2eafd155 (diff) | |
| download | php-git-9e5313fdcaf7257abcccc29b504effa07d08211b.tar.gz | |
- [DOC] MFH: add session.entropy* support to windows
Diffstat (limited to 'ext/session')
| -rw-r--r-- | ext/session/session.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index dac8e954b7..fae961f51e 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -26,7 +26,8 @@ #include "php.h" #ifdef PHP_WIN32 -#include "win32/time.h" +# include "win32/winutil.h" +# include "win32/time.h" #else #include <sys/time.h> #endif @@ -402,6 +403,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); + + 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); @@ -431,6 +454,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */ } close(fd); } +#endif } digest = emalloc(digest_len + 1); |