]> granicus.if.org Git - php/commitdiff
Revert change to use a special Windows version of openssl_random_pseudo_bytes().
authorScott MacVicar <scottmac@php.net>
Tue, 19 Jul 2011 22:29:55 +0000 (22:29 +0000)
committerScott MacVicar <scottmac@php.net>
Tue, 19 Jul 2011 22:29:55 +0000 (22:29 +0000)
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?

ext/openssl/openssl.c

index b41d04c3bb47361c5d1565e126cdce9e12bc44ef..f8266a381c241b3f3c3387ccea85a95f0c905283 100644 (file)
@@ -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);