scottmac                                 Tue, 19 Jul 2011 22:29:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=313455

Log:
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?

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
    U   php/php-src/trunk/ext/openssl/openssl.c

Modified: php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/openssl/openssl.c  2011-07-19 22:18:08 UTC 
(rev 313454)
+++ php/php-src/branches/PHP_5_4/ext/openssl/openssl.c  2011-07-19 22:29:55 UTC 
(rev 313455)
@@ -4930,19 +4930,10 @@

        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);

Modified: php/php-src/trunk/ext/openssl/openssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/openssl.c     2011-07-19 22:18:08 UTC (rev 
313454)
+++ php/php-src/trunk/ext/openssl/openssl.c     2011-07-19 22:29:55 UTC (rev 
313455)
@@ -4926,19 +4926,10 @@

        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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to