]> granicus.if.org Git - php/commitdiff
Do not add extra timeval entropy when OpenSSL 1.1 used
authorJakub Zelenka <bukka@php.net>
Sun, 27 Nov 2016 19:00:05 +0000 (19:00 +0000)
committerJakub Zelenka <bukka@php.net>
Sun, 27 Nov 2016 19:00:05 +0000 (19:00 +0000)
It is already added by OpenSSL so it is not needed

ext/openssl/openssl.c

index 1ebbe99c4e9c65d4b30f067fc3481307b64ef7a1..7e0721ca549d792088ca8e04d16e0cfe54c4f17d 100644 (file)
@@ -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()