diff options
| author | Pierre Joye <pajoye@php.net> | 2011-07-10 14:36:32 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-07-10 14:36:32 +0000 |
| commit | 04432e7dd85d774a3eac6f3effca9f4e7cfb42d6 (patch) | |
| tree | 8ca68a760733ffb42ad5690b03d926c92e12aed1 /win32/winutil.c | |
| parent | b8dd53b713a6528259e9936000639838611a60b5 (diff) | |
| download | php-git-04432e7dd85d774a3eac6f3effca9f4e7cfb42d6.tar.gz | |
- fix bug #55169, mcrypt_create_iv always fails to gather sufficient random data
Diffstat (limited to 'win32/winutil.c')
| -rw-r--r-- | win32/winutil.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win32/winutil.c b/win32/winutil.c index dae01584a9..f3043f50aa 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -87,7 +87,7 @@ PHPAPI int php_win32_get_random_bytes(unsigned char *buf, size_t size) { /* {{{ #endif if (has_crypto_ctx == 0) { - if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET)) { + if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) { /* Could mean that the key container does not exist, let try again by asking for a new one */ if (GetLastError() == NTE_BAD_KEYSET) { @@ -97,6 +97,8 @@ PHPAPI int php_win32_get_random_bytes(unsigned char *buf, size_t size) { /* {{{ has_crypto_ctx = 0; } } + } else { + has_crypto_ctx = 1; } } |