-
-
Save MasonM/05b4e425d55c6d6d1b23 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c | |
index 23f893e..8cd40a5 100644 | |
--- a/ext/openssl/openssl.c | |
+++ b/ext/openssl/openssl.c | |
@@ -5377,7 +5377,6 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) | |
long buffer_length; | |
unsigned char *buffer = NULL; | |
zval *zstrong_result_returned = NULL; | |
- int strong_result = 0; | |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|z", &buffer_length, &zstrong_result_returned) == FAILURE) { | |
return; | |
@@ -5395,7 +5394,6 @@ 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); | |
@@ -5405,7 +5403,7 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) | |
RETURN_FALSE; | |
} | |
#else | |
- if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) < 0) { | |
+ if (RAND_bytes(buffer, buffer_length) <= 0) { | |
efree(buffer); | |
if (zstrong_result_returned) { | |
ZVAL_BOOL(zstrong_result_returned, 0); | |
@@ -5418,7 +5416,7 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) | |
RETVAL_STRINGL((char *)buffer, buffer_length, 0); | |
if (zstrong_result_returned) { | |
- ZVAL_BOOL(zstrong_result_returned, strong_result); | |
+ ZVAL_BOOL(zstrong_result_returned, 1); | |
} | |
} | |
/* }}} */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment