diff options
| author | Sammy Kaye Powers <sammyk@sammykmedia.com> | 2018-11-19 18:14:53 -0500 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-11 11:16:05 +0100 |
| commit | 74c0e580efa8feb282d0da9c830c6bd01b08b45e (patch) | |
| tree | 971d6119e39e46695074a5c4fc5b13d79d631996 /ext/openssl/openssl.c | |
| parent | 894e78b4946b33d1f68d172903962dab1b08c7af (diff) | |
| download | php-git-74c0e580efa8feb282d0da9c830c6bd01b08b45e.tar.gz | |
Improve openssl_random_pseudo_bytes()
CSPRNG implementations should always fail closed. Now
openssl_random_pseudo_bytes() will fail closed by throwing an
`\Exception` in fail conditions.
RFC: https://wiki.php.net/rfc/improve-openssl-random-pseudo-bytes
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 7fcab17ed6..e97cd8fda6 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -28,6 +28,7 @@ #include "php.h" #include "php_ini.h" #include "php_openssl.h" +#include "zend_exceptions.h" /* PHP Includes */ #include "ext/standard/file.h" @@ -6861,7 +6862,8 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) || ZEND_LONG_INT_OVFL(buffer_length) #endif ) { - RETURN_FALSE; + zend_throw_exception(zend_ce_error, "Length must be greater than 0", 0); + return; } buffer = zend_string_alloc(buffer_length, 0); @@ -6872,7 +6874,8 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) if (zstrong_result_returned) { ZVAL_FALSE(zstrong_result_returned); } - RETURN_FALSE; + zend_throw_exception(zend_ce_exception, "Error reading from source device", 0); + return; } #else @@ -6884,7 +6887,8 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) if (zstrong_result_returned) { ZVAL_FALSE(zstrong_result_returned); } - RETURN_FALSE; + zend_throw_exception(zend_ce_exception, "Error reading from source device", 0); + return; } else { php_openssl_store_errors(); } |