diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-11-27 19:00:05 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-11-27 19:00:05 +0000 |
| commit | 0ebdf3625e629b2a4f9255190dfb04a67e511617 (patch) | |
| tree | 181babca1cf5ef9039765378c0de9f59c6a71521 | |
| parent | 0f4216298fbd9a1fdcf978967ac04df76f6283d0 (diff) | |
| download | php-git-0ebdf3625e629b2a4f9255190dfb04a67e511617.tar.gz | |
Do not add extra timeval entropy when OpenSSL 1.1 used
It is already added by OpenSSL so it is not needed
| -rw-r--r-- | ext/openssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 1ebbe99c4e..7e0721ca54 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1209,7 +1209,7 @@ static void php_openssl_dispose_config(struct php_x509_request * req) /* {{{ */ } /* }}} */ -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) #define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0) #else #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval() |