archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- [DOC] add session.entropy* support to windows

Browse source
This commit is contained in:
Pierre Joye 2010-06-08 13:46:19 +00:00
parent dd73c48d57
commit bfe51d3895
3 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ext/session/session.c
View file

@ -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);

2
php.ini-development
View file

@ -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

2
php.ini-production
View file

@ -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