From: Scott MacVicar <scottmac@php.net>
Date: Tue, 19 Jul 2011 22:29:55 +0000 (+0000)
Subject: Revert change to use a special Windows version of openssl_random_pseudo_bytes().
X-Git-Tag: php-5.4.0alpha3~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=591e0e446fb070cf8ed7043cc9cc00e2b4a096cf;p=php

Revert change to use a special Windows version of openssl_random_pseudo_bytes().

Lets discuss this on internals first. We're advertising something from the OpenSSL library
and then subverting it with another Windows OS call.

What are the implications of this? Should we make this available in ext/standard/ instead?
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index b41d04c3bb..f8266a381c 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4930,19 +4930,10 @@ PHP_FUNCTION(openssl_random_pseudo_bytes)
 
 	buffer = emalloc(buffer_length + 1);
 
-#ifdef PHP_WIN32
-	strong_result = 1;
-	/* random/urandom equivalent on Windows */
-	if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) == FAILURE){
-		efree(buffer);
-		RETURN_FALSE;
-	}
-#else
 	if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) < 0) {
 		efree(buffer);
 		RETURN_FALSE;
 	}
-#endif
 
 	buffer[buffer_length] = 0;
 	RETVAL_STRINGL((char *)buffer, buffer_length, 0);