@@ -30,26 +30,26 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | |
| 32 | 32 | if (!defined('PHP_VERSION_ID')) { |
| 33 | - // This constant was introduced in PHP 5.2.7 |
|
| 34 | - $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION)); |
|
| 35 | - define( |
|
| 36 | - 'PHP_VERSION_ID', |
|
| 37 | - $RandomCompatversion[0] * 10000 |
|
| 38 | - + $RandomCompatversion[1] * 100 |
|
| 39 | - + $RandomCompatversion[2] |
|
| 40 | - ); |
|
| 41 | - $RandomCompatversion = null; |
|
| 33 | + // This constant was introduced in PHP 5.2.7 |
|
| 34 | + $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION)); |
|
| 35 | + define( |
|
| 36 | + 'PHP_VERSION_ID', |
|
| 37 | + $RandomCompatversion[0] * 10000 |
|
| 38 | + + $RandomCompatversion[1] * 100 |
|
| 39 | + + $RandomCompatversion[2] |
|
| 40 | + ); |
|
| 41 | + $RandomCompatversion = null; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * PHP 7.0.0 and newer have these functions natively. |
| 46 | 46 | */ |
| 47 | 47 | if (PHP_VERSION_ID >= 70000) { |
| 48 | - return; |
|
| 48 | + return; |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if (!defined('RANDOM_COMPAT_READ_BUFFER')) { |
| 52 | - define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
| 52 | + define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $RandomCompatDIR = dirname(__FILE__); |
@@ -59,167 +59,167 @@ discard block |
||
| 59 | 59 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php'; |
| 60 | 60 | |
| 61 | 61 | if (!is_callable('random_bytes')) { |
| 62 | - /** |
|
| 63 | - * PHP 5.2.0 - 5.6.x way to implement random_bytes() |
|
| 64 | - * |
|
| 65 | - * We use conditional statements here to define the function in accordance |
|
| 66 | - * to the operating environment. It's a micro-optimization. |
|
| 67 | - * |
|
| 68 | - * In order of preference: |
|
| 69 | - * 1. Use libsodium if available. |
|
| 70 | - * 2. fread() /dev/urandom if available (never on Windows) |
|
| 71 | - * 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM) |
|
| 72 | - * 4. COM('CAPICOM.Utilities.1')->GetRandom() |
|
| 73 | - * |
|
| 74 | - * See RATIONALE.md for our reasoning behind this particular order |
|
| 75 | - */ |
|
| 76 | - if (extension_loaded('libsodium')) { |
|
| 77 | - // See random_bytes_libsodium.php |
|
| 78 | - if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) { |
|
| 79 | - require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php'; |
|
| 80 | - } elseif (method_exists('Sodium', 'randombytes_buf')) { |
|
| 81 | - require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php'; |
|
| 82 | - } |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - /** |
|
| 86 | - * Reading directly from /dev/urandom: |
|
| 87 | - */ |
|
| 88 | - if (DIRECTORY_SEPARATOR === '/') { |
|
| 89 | - // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast |
|
| 90 | - // way to exclude Windows. |
|
| 91 | - $RandomCompatUrandom = true; |
|
| 92 | - $RandomCompat_basedir = ini_get('open_basedir'); |
|
| 93 | - |
|
| 94 | - if (!empty($RandomCompat_basedir)) { |
|
| 95 | - $RandomCompat_open_basedir = explode( |
|
| 96 | - PATH_SEPARATOR, |
|
| 97 | - strtolower($RandomCompat_basedir) |
|
| 98 | - ); |
|
| 99 | - $RandomCompatUrandom = (array() !== array_intersect( |
|
| 100 | - array('/dev', '/dev/', '/dev/urandom'), |
|
| 101 | - $RandomCompat_open_basedir |
|
| 102 | - )); |
|
| 103 | - $RandomCompat_open_basedir = null; |
|
| 104 | - } |
|
| 105 | - |
|
| 106 | - if ( |
|
| 107 | - !is_callable('random_bytes') |
|
| 108 | - && |
|
| 109 | - $RandomCompatUrandom |
|
| 110 | - && |
|
| 111 | - @is_readable('/dev/urandom') |
|
| 112 | - ) { |
|
| 113 | - // Error suppression on is_readable() in case of an open_basedir |
|
| 114 | - // or safe_mode failure. All we care about is whether or not we |
|
| 115 | - // can read it at this point. If the PHP environment is going to |
|
| 116 | - // panic over trying to see if the file can be read in the first |
|
| 117 | - // place, that is not helpful to us here. |
|
| 118 | - |
|
| 119 | - // See random_bytes_dev_urandom.php |
|
| 120 | - require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_dev_urandom.php'; |
|
| 121 | - } |
|
| 122 | - // Unset variables after use |
|
| 123 | - $RandomCompat_basedir = null; |
|
| 124 | - } else { |
|
| 125 | - $RandomCompatUrandom = false; |
|
| 126 | - } |
|
| 127 | - |
|
| 128 | - /** |
|
| 129 | - * mcrypt_create_iv() |
|
| 130 | - * |
|
| 131 | - * We only want to use mcypt_create_iv() if: |
|
| 132 | - * |
|
| 133 | - * - random_bytes() hasn't already been defined |
|
| 134 | - * - the mcrypt extensions is loaded |
|
| 135 | - * - One of these two conditions is true: |
|
| 136 | - * - We're on Windows (DIRECTORY_SEPARATOR !== '/') |
|
| 137 | - * - We're not on Windows and /dev/urandom is readabale |
|
| 138 | - * (i.e. we're not in a chroot jail) |
|
| 139 | - * - Special case: |
|
| 140 | - * - If we're not on Windows, but the PHP version is between |
|
| 141 | - * 5.6.10 and 5.6.12, we don't want to use mcrypt. It will |
|
| 142 | - * hang indefinitely. This is bad. |
|
| 143 | - * - If we're on Windows, we want to use PHP >= 5.3.7 or else |
|
| 144 | - * we get insufficient entropy errors. |
|
| 145 | - */ |
|
| 146 | - if ( |
|
| 147 | - !is_callable('random_bytes') |
|
| 148 | - && |
|
| 149 | - // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be. |
|
| 150 | - (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307) |
|
| 151 | - && |
|
| 152 | - // Prevent this code from hanging indefinitely on non-Windows; |
|
| 153 | - // see https://bugs.php.net/bug.php?id=69833 |
|
| 154 | - ( |
|
| 155 | - DIRECTORY_SEPARATOR !== '/' || |
|
| 156 | - (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) |
|
| 157 | - ) |
|
| 158 | - && |
|
| 159 | - extension_loaded('mcrypt') |
|
| 160 | - ) { |
|
| 161 | - // See random_bytes_mcrypt.php |
|
| 162 | - require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_mcrypt.php'; |
|
| 163 | - } |
|
| 164 | - $RandomCompatUrandom = null; |
|
| 165 | - |
|
| 166 | - /** |
|
| 167 | - * This is a Windows-specific fallback, for when the mcrypt extension |
|
| 168 | - * isn't loaded. |
|
| 169 | - */ |
|
| 170 | - if ( |
|
| 171 | - !is_callable('random_bytes') |
|
| 172 | - && |
|
| 173 | - extension_loaded('com_dotnet') |
|
| 174 | - && |
|
| 175 | - class_exists('COM') |
|
| 176 | - ) { |
|
| 177 | - $RandomCompat_disabled_classes = preg_split( |
|
| 178 | - '#\s*,\s*#', |
|
| 179 | - strtolower(ini_get('disable_classes')) |
|
| 180 | - ); |
|
| 181 | - |
|
| 182 | - if (!in_array('com', $RandomCompat_disabled_classes)) { |
|
| 183 | - try { |
|
| 184 | - $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); |
|
| 185 | - if (method_exists($RandomCompatCOMtest, 'GetRandom')) { |
|
| 186 | - // See random_bytes_com_dotnet.php |
|
| 187 | - require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php'; |
|
| 188 | - } |
|
| 189 | - } catch (com_exception $e) { |
|
| 190 | - // Don't try to use it. |
|
| 191 | - } |
|
| 192 | - } |
|
| 193 | - $RandomCompat_disabled_classes = null; |
|
| 194 | - $RandomCompatCOMtest = null; |
|
| 195 | - } |
|
| 196 | - |
|
| 197 | - /** |
|
| 198 | - * throw new Exception |
|
| 199 | - */ |
|
| 200 | - if (!is_callable('random_bytes')) { |
|
| 201 | - /** |
|
| 202 | - * We don't have any more options, so let's throw an exception right now |
|
| 203 | - * and hope the developer won't let it fail silently. |
|
| 204 | - * |
|
| 205 | - * @param mixed $length |
|
| 206 | - * @psalm-suppress InvalidReturnType |
|
| 207 | - * @throws Exception |
|
| 208 | - * @return string |
|
| 209 | - */ |
|
| 210 | - function random_bytes($length) |
|
| 211 | - { |
|
| 212 | - unset($length); // Suppress "variable not used" warnings. |
|
| 213 | - throw new Exception( |
|
| 214 | - 'There is no suitable CSPRNG installed on your system' |
|
| 215 | - ); |
|
| 216 | - return ''; |
|
| 217 | - } |
|
| 218 | - } |
|
| 62 | + /** |
|
| 63 | + * PHP 5.2.0 - 5.6.x way to implement random_bytes() |
|
| 64 | + * |
|
| 65 | + * We use conditional statements here to define the function in accordance |
|
| 66 | + * to the operating environment. It's a micro-optimization. |
|
| 67 | + * |
|
| 68 | + * In order of preference: |
|
| 69 | + * 1. Use libsodium if available. |
|
| 70 | + * 2. fread() /dev/urandom if available (never on Windows) |
|
| 71 | + * 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM) |
|
| 72 | + * 4. COM('CAPICOM.Utilities.1')->GetRandom() |
|
| 73 | + * |
|
| 74 | + * See RATIONALE.md for our reasoning behind this particular order |
|
| 75 | + */ |
|
| 76 | + if (extension_loaded('libsodium')) { |
|
| 77 | + // See random_bytes_libsodium.php |
|
| 78 | + if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) { |
|
| 79 | + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php'; |
|
| 80 | + } elseif (method_exists('Sodium', 'randombytes_buf')) { |
|
| 81 | + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php'; |
|
| 82 | + } |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + /** |
|
| 86 | + * Reading directly from /dev/urandom: |
|
| 87 | + */ |
|
| 88 | + if (DIRECTORY_SEPARATOR === '/') { |
|
| 89 | + // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast |
|
| 90 | + // way to exclude Windows. |
|
| 91 | + $RandomCompatUrandom = true; |
|
| 92 | + $RandomCompat_basedir = ini_get('open_basedir'); |
|
| 93 | + |
|
| 94 | + if (!empty($RandomCompat_basedir)) { |
|
| 95 | + $RandomCompat_open_basedir = explode( |
|
| 96 | + PATH_SEPARATOR, |
|
| 97 | + strtolower($RandomCompat_basedir) |
|
| 98 | + ); |
|
| 99 | + $RandomCompatUrandom = (array() !== array_intersect( |
|
| 100 | + array('/dev', '/dev/', '/dev/urandom'), |
|
| 101 | + $RandomCompat_open_basedir |
|
| 102 | + )); |
|
| 103 | + $RandomCompat_open_basedir = null; |
|
| 104 | + } |
|
| 105 | + |
|
| 106 | + if ( |
|
| 107 | + !is_callable('random_bytes') |
|
| 108 | + && |
|
| 109 | + $RandomCompatUrandom |
|
| 110 | + && |
|
| 111 | + @is_readable('/dev/urandom') |
|
| 112 | + ) { |
|
| 113 | + // Error suppression on is_readable() in case of an open_basedir |
|
| 114 | + // or safe_mode failure. All we care about is whether or not we |
|
| 115 | + // can read it at this point. If the PHP environment is going to |
|
| 116 | + // panic over trying to see if the file can be read in the first |
|
| 117 | + // place, that is not helpful to us here. |
|
| 118 | + |
|
| 119 | + // See random_bytes_dev_urandom.php |
|
| 120 | + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_dev_urandom.php'; |
|
| 121 | + } |
|
| 122 | + // Unset variables after use |
|
| 123 | + $RandomCompat_basedir = null; |
|
| 124 | + } else { |
|
| 125 | + $RandomCompatUrandom = false; |
|
| 126 | + } |
|
| 127 | + |
|
| 128 | + /** |
|
| 129 | + * mcrypt_create_iv() |
|
| 130 | + * |
|
| 131 | + * We only want to use mcypt_create_iv() if: |
|
| 132 | + * |
|
| 133 | + * - random_bytes() hasn't already been defined |
|
| 134 | + * - the mcrypt extensions is loaded |
|
| 135 | + * - One of these two conditions is true: |
|
| 136 | + * - We're on Windows (DIRECTORY_SEPARATOR !== '/') |
|
| 137 | + * - We're not on Windows and /dev/urandom is readabale |
|
| 138 | + * (i.e. we're not in a chroot jail) |
|
| 139 | + * - Special case: |
|
| 140 | + * - If we're not on Windows, but the PHP version is between |
|
| 141 | + * 5.6.10 and 5.6.12, we don't want to use mcrypt. It will |
|
| 142 | + * hang indefinitely. This is bad. |
|
| 143 | + * - If we're on Windows, we want to use PHP >= 5.3.7 or else |
|
| 144 | + * we get insufficient entropy errors. |
|
| 145 | + */ |
|
| 146 | + if ( |
|
| 147 | + !is_callable('random_bytes') |
|
| 148 | + && |
|
| 149 | + // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be. |
|
| 150 | + (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307) |
|
| 151 | + && |
|
| 152 | + // Prevent this code from hanging indefinitely on non-Windows; |
|
| 153 | + // see https://bugs.php.net/bug.php?id=69833 |
|
| 154 | + ( |
|
| 155 | + DIRECTORY_SEPARATOR !== '/' || |
|
| 156 | + (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) |
|
| 157 | + ) |
|
| 158 | + && |
|
| 159 | + extension_loaded('mcrypt') |
|
| 160 | + ) { |
|
| 161 | + // See random_bytes_mcrypt.php |
|
| 162 | + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_mcrypt.php'; |
|
| 163 | + } |
|
| 164 | + $RandomCompatUrandom = null; |
|
| 165 | + |
|
| 166 | + /** |
|
| 167 | + * This is a Windows-specific fallback, for when the mcrypt extension |
|
| 168 | + * isn't loaded. |
|
| 169 | + */ |
|
| 170 | + if ( |
|
| 171 | + !is_callable('random_bytes') |
|
| 172 | + && |
|
| 173 | + extension_loaded('com_dotnet') |
|
| 174 | + && |
|
| 175 | + class_exists('COM') |
|
| 176 | + ) { |
|
| 177 | + $RandomCompat_disabled_classes = preg_split( |
|
| 178 | + '#\s*,\s*#', |
|
| 179 | + strtolower(ini_get('disable_classes')) |
|
| 180 | + ); |
|
| 181 | + |
|
| 182 | + if (!in_array('com', $RandomCompat_disabled_classes)) { |
|
| 183 | + try { |
|
| 184 | + $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); |
|
| 185 | + if (method_exists($RandomCompatCOMtest, 'GetRandom')) { |
|
| 186 | + // See random_bytes_com_dotnet.php |
|
| 187 | + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php'; |
|
| 188 | + } |
|
| 189 | + } catch (com_exception $e) { |
|
| 190 | + // Don't try to use it. |
|
| 191 | + } |
|
| 192 | + } |
|
| 193 | + $RandomCompat_disabled_classes = null; |
|
| 194 | + $RandomCompatCOMtest = null; |
|
| 195 | + } |
|
| 196 | + |
|
| 197 | + /** |
|
| 198 | + * throw new Exception |
|
| 199 | + */ |
|
| 200 | + if (!is_callable('random_bytes')) { |
|
| 201 | + /** |
|
| 202 | + * We don't have any more options, so let's throw an exception right now |
|
| 203 | + * and hope the developer won't let it fail silently. |
|
| 204 | + * |
|
| 205 | + * @param mixed $length |
|
| 206 | + * @psalm-suppress InvalidReturnType |
|
| 207 | + * @throws Exception |
|
| 208 | + * @return string |
|
| 209 | + */ |
|
| 210 | + function random_bytes($length) |
|
| 211 | + { |
|
| 212 | + unset($length); // Suppress "variable not used" warnings. |
|
| 213 | + throw new Exception( |
|
| 214 | + 'There is no suitable CSPRNG installed on your system' |
|
| 215 | + ); |
|
| 216 | + return ''; |
|
| 217 | + } |
|
| 218 | + } |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | if (!is_callable('random_int')) { |
| 222 | - require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php'; |
|
| 222 | + require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php'; |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | $RandomCompatDIR = null; |
@@ -27,67 +27,67 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | 29 | if (!is_callable('random_bytes')) { |
| 30 | - /** |
|
| 31 | - * If the libsodium PHP extension is loaded, we'll use it above any other |
|
| 32 | - * solution. |
|
| 33 | - * |
|
| 34 | - * libsodium-php project: |
|
| 35 | - * @ref https://github.com/jedisct1/libsodium-php |
|
| 36 | - * |
|
| 37 | - * @param int $bytes |
|
| 38 | - * |
|
| 39 | - * @throws Exception |
|
| 40 | - * |
|
| 41 | - * @return string |
|
| 42 | - */ |
|
| 43 | - function random_bytes($bytes) |
|
| 44 | - { |
|
| 45 | - try { |
|
| 46 | - /** @var int $bytes */ |
|
| 47 | - $bytes = RandomCompat_intval($bytes); |
|
| 48 | - } catch (TypeError $ex) { |
|
| 49 | - throw new TypeError( |
|
| 50 | - 'random_bytes(): $bytes must be an integer' |
|
| 51 | - ); |
|
| 52 | - } |
|
| 30 | + /** |
|
| 31 | + * If the libsodium PHP extension is loaded, we'll use it above any other |
|
| 32 | + * solution. |
|
| 33 | + * |
|
| 34 | + * libsodium-php project: |
|
| 35 | + * @ref https://github.com/jedisct1/libsodium-php |
|
| 36 | + * |
|
| 37 | + * @param int $bytes |
|
| 38 | + * |
|
| 39 | + * @throws Exception |
|
| 40 | + * |
|
| 41 | + * @return string |
|
| 42 | + */ |
|
| 43 | + function random_bytes($bytes) |
|
| 44 | + { |
|
| 45 | + try { |
|
| 46 | + /** @var int $bytes */ |
|
| 47 | + $bytes = RandomCompat_intval($bytes); |
|
| 48 | + } catch (TypeError $ex) { |
|
| 49 | + throw new TypeError( |
|
| 50 | + 'random_bytes(): $bytes must be an integer' |
|
| 51 | + ); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - if ($bytes < 1) { |
|
| 55 | - throw new Error( |
|
| 56 | - 'Length must be greater than 0' |
|
| 57 | - ); |
|
| 58 | - } |
|
| 54 | + if ($bytes < 1) { |
|
| 55 | + throw new Error( |
|
| 56 | + 'Length must be greater than 0' |
|
| 57 | + ); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @var string |
|
| 62 | - */ |
|
| 63 | - $buf = ''; |
|
| 60 | + /** |
|
| 61 | + * @var string |
|
| 62 | + */ |
|
| 63 | + $buf = ''; |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
| 67 | - * generated in one invocation. |
|
| 68 | - */ |
|
| 69 | - if ($bytes > 2147483647) { |
|
| 70 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 71 | - $n = ($bytes - $i) > 1073741824 |
|
| 72 | - ? 1073741824 |
|
| 73 | - : $bytes - $i; |
|
| 74 | - $buf .= Sodium::randombytes_buf((int) $n); |
|
| 75 | - } |
|
| 76 | - } else { |
|
| 77 | - $buf .= Sodium::randombytes_buf((int) $bytes); |
|
| 78 | - } |
|
| 65 | + /** |
|
| 66 | + * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
| 67 | + * generated in one invocation. |
|
| 68 | + */ |
|
| 69 | + if ($bytes > 2147483647) { |
|
| 70 | + for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 71 | + $n = ($bytes - $i) > 1073741824 |
|
| 72 | + ? 1073741824 |
|
| 73 | + : $bytes - $i; |
|
| 74 | + $buf .= Sodium::randombytes_buf((int) $n); |
|
| 75 | + } |
|
| 76 | + } else { |
|
| 77 | + $buf .= Sodium::randombytes_buf((int) $bytes); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - if (is_string($buf)) { |
|
| 81 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 82 | - return $buf; |
|
| 83 | - } |
|
| 84 | - } |
|
| 80 | + if (is_string($buf)) { |
|
| 81 | + if (RandomCompat_strlen($buf) === $bytes) { |
|
| 82 | + return $buf; |
|
| 83 | + } |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * If we reach here, PHP has failed us. |
|
| 88 | - */ |
|
| 89 | - throw new Exception( |
|
| 90 | - 'Could not gather sufficient random data' |
|
| 91 | - ); |
|
| 92 | - } |
|
| 86 | + /** |
|
| 87 | + * If we reach here, PHP has failed us. |
|
| 88 | + */ |
|
| 89 | + throw new Exception( |
|
| 90 | + 'Could not gather sufficient random data' |
|
| 91 | + ); |
|
| 92 | + } |
|
| 93 | 93 | } |
@@ -27,65 +27,65 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | 29 | if (!is_callable('random_bytes')) { |
| 30 | - /** |
|
| 31 | - * If the libsodium PHP extension is loaded, we'll use it above any other |
|
| 32 | - * solution. |
|
| 33 | - * |
|
| 34 | - * libsodium-php project: |
|
| 35 | - * @ref https://github.com/jedisct1/libsodium-php |
|
| 36 | - * |
|
| 37 | - * @param int $bytes |
|
| 38 | - * |
|
| 39 | - * @throws Exception |
|
| 40 | - * |
|
| 41 | - * @return string |
|
| 42 | - */ |
|
| 43 | - function random_bytes($bytes) |
|
| 44 | - { |
|
| 45 | - try { |
|
| 46 | - /** @var int $bytes */ |
|
| 47 | - $bytes = RandomCompat_intval($bytes); |
|
| 48 | - } catch (TypeError $ex) { |
|
| 49 | - throw new TypeError( |
|
| 50 | - 'random_bytes(): $bytes must be an integer' |
|
| 51 | - ); |
|
| 52 | - } |
|
| 30 | + /** |
|
| 31 | + * If the libsodium PHP extension is loaded, we'll use it above any other |
|
| 32 | + * solution. |
|
| 33 | + * |
|
| 34 | + * libsodium-php project: |
|
| 35 | + * @ref https://github.com/jedisct1/libsodium-php |
|
| 36 | + * |
|
| 37 | + * @param int $bytes |
|
| 38 | + * |
|
| 39 | + * @throws Exception |
|
| 40 | + * |
|
| 41 | + * @return string |
|
| 42 | + */ |
|
| 43 | + function random_bytes($bytes) |
|
| 44 | + { |
|
| 45 | + try { |
|
| 46 | + /** @var int $bytes */ |
|
| 47 | + $bytes = RandomCompat_intval($bytes); |
|
| 48 | + } catch (TypeError $ex) { |
|
| 49 | + throw new TypeError( |
|
| 50 | + 'random_bytes(): $bytes must be an integer' |
|
| 51 | + ); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - if ($bytes < 1) { |
|
| 55 | - throw new Error( |
|
| 56 | - 'Length must be greater than 0' |
|
| 57 | - ); |
|
| 58 | - } |
|
| 54 | + if ($bytes < 1) { |
|
| 55 | + throw new Error( |
|
| 56 | + 'Length must be greater than 0' |
|
| 57 | + ); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
| 62 | - * generated in one invocation. |
|
| 63 | - */ |
|
| 64 | - /** @var string|bool $buf */ |
|
| 65 | - if ($bytes > 2147483647) { |
|
| 66 | - $buf = ''; |
|
| 67 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 68 | - $n = ($bytes - $i) > 1073741824 |
|
| 69 | - ? 1073741824 |
|
| 70 | - : $bytes - $i; |
|
| 71 | - $buf .= \Sodium\randombytes_buf($n); |
|
| 72 | - } |
|
| 73 | - } else { |
|
| 74 | - /** @var string|bool $buf */ |
|
| 75 | - $buf = \Sodium\randombytes_buf($bytes); |
|
| 76 | - } |
|
| 60 | + /** |
|
| 61 | + * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
|
| 62 | + * generated in one invocation. |
|
| 63 | + */ |
|
| 64 | + /** @var string|bool $buf */ |
|
| 65 | + if ($bytes > 2147483647) { |
|
| 66 | + $buf = ''; |
|
| 67 | + for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 68 | + $n = ($bytes - $i) > 1073741824 |
|
| 69 | + ? 1073741824 |
|
| 70 | + : $bytes - $i; |
|
| 71 | + $buf .= \Sodium\randombytes_buf($n); |
|
| 72 | + } |
|
| 73 | + } else { |
|
| 74 | + /** @var string|bool $buf */ |
|
| 75 | + $buf = \Sodium\randombytes_buf($bytes); |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - if (is_string($buf)) { |
|
| 79 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 80 | - return $buf; |
|
| 81 | - } |
|
| 82 | - } |
|
| 78 | + if (is_string($buf)) { |
|
| 79 | + if (RandomCompat_strlen($buf) === $bytes) { |
|
| 80 | + return $buf; |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - /** |
|
| 85 | - * If we reach here, PHP has failed us. |
|
| 86 | - */ |
|
| 87 | - throw new Exception( |
|
| 88 | - 'Could not gather sufficient random data' |
|
| 89 | - ); |
|
| 90 | - } |
|
| 84 | + /** |
|
| 85 | + * If we reach here, PHP has failed us. |
|
| 86 | + */ |
|
| 87 | + throw new Exception( |
|
| 88 | + 'Could not gather sufficient random data' |
|
| 89 | + ); |
|
| 90 | + } |
|
| 91 | 91 | } |
@@ -28,50 +28,50 @@ |
||
| 28 | 28 | |
| 29 | 29 | if (!is_callable('RandomCompat_intval')) { |
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Cast to an integer if we can, safely. |
|
| 33 | - * |
|
| 34 | - * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) |
|
| 35 | - * (non-inclusive), it will sanely cast it to an int. If you it's equal to |
|
| 36 | - * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats |
|
| 37 | - * lose precision, so the <= and => operators might accidentally let a float |
|
| 38 | - * through. |
|
| 39 | - * |
|
| 40 | - * @param int|float $number The number we want to convert to an int |
|
| 41 | - * @param bool $fail_open Set to true to not throw an exception |
|
| 42 | - * |
|
| 43 | - * @return float|int |
|
| 44 | - * @psalm-suppress InvalidReturnType |
|
| 45 | - * |
|
| 46 | - * @throws TypeError |
|
| 47 | - */ |
|
| 48 | - function RandomCompat_intval($number, $fail_open = false) |
|
| 49 | - { |
|
| 50 | - if (is_int($number) || is_float($number)) { |
|
| 51 | - $number += 0; |
|
| 52 | - } elseif (is_numeric($number)) { |
|
| 53 | - /** @psalm-suppress InvalidOperand */ |
|
| 54 | - $number += 0; |
|
| 55 | - } |
|
| 56 | - /** @var int|float $number */ |
|
| 31 | + /** |
|
| 32 | + * Cast to an integer if we can, safely. |
|
| 33 | + * |
|
| 34 | + * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX) |
|
| 35 | + * (non-inclusive), it will sanely cast it to an int. If you it's equal to |
|
| 36 | + * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats |
|
| 37 | + * lose precision, so the <= and => operators might accidentally let a float |
|
| 38 | + * through. |
|
| 39 | + * |
|
| 40 | + * @param int|float $number The number we want to convert to an int |
|
| 41 | + * @param bool $fail_open Set to true to not throw an exception |
|
| 42 | + * |
|
| 43 | + * @return float|int |
|
| 44 | + * @psalm-suppress InvalidReturnType |
|
| 45 | + * |
|
| 46 | + * @throws TypeError |
|
| 47 | + */ |
|
| 48 | + function RandomCompat_intval($number, $fail_open = false) |
|
| 49 | + { |
|
| 50 | + if (is_int($number) || is_float($number)) { |
|
| 51 | + $number += 0; |
|
| 52 | + } elseif (is_numeric($number)) { |
|
| 53 | + /** @psalm-suppress InvalidOperand */ |
|
| 54 | + $number += 0; |
|
| 55 | + } |
|
| 56 | + /** @var int|float $number */ |
|
| 57 | 57 | |
| 58 | - if ( |
|
| 59 | - is_float($number) |
|
| 60 | - && |
|
| 61 | - $number > ~PHP_INT_MAX |
|
| 62 | - && |
|
| 63 | - $number < PHP_INT_MAX |
|
| 64 | - ) { |
|
| 65 | - $number = (int) $number; |
|
| 66 | - } |
|
| 58 | + if ( |
|
| 59 | + is_float($number) |
|
| 60 | + && |
|
| 61 | + $number > ~PHP_INT_MAX |
|
| 62 | + && |
|
| 63 | + $number < PHP_INT_MAX |
|
| 64 | + ) { |
|
| 65 | + $number = (int) $number; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - if (is_int($number)) { |
|
| 69 | - return (int) $number; |
|
| 70 | - } elseif (!$fail_open) { |
|
| 71 | - throw new TypeError( |
|
| 72 | - 'Expected an integer.' |
|
| 73 | - ); |
|
| 74 | - } |
|
| 75 | - return $number; |
|
| 76 | - } |
|
| 68 | + if (is_int($number)) { |
|
| 69 | + return (int) $number; |
|
| 70 | + } elseif (!$fail_open) { |
|
| 71 | + throw new TypeError( |
|
| 72 | + 'Expected an integer.' |
|
| 73 | + ); |
|
| 74 | + } |
|
| 75 | + return $number; |
|
| 76 | + } |
|
| 77 | 77 | } |
@@ -7082,32 +7082,32 @@ discard block |
||
| 7082 | 7082 | */ |
| 7083 | 7083 | function truncate_array($array, $max_length = 1900, $deep = 3) |
| 7084 | 7084 | { |
| 7085 | - $array = (array) $array; |
|
| 7085 | + $array = (array) $array; |
|
| 7086 | 7086 | |
| 7087 | - $curr_length = array_length($array, $deep); |
|
| 7087 | + $curr_length = array_length($array, $deep); |
|
| 7088 | 7088 | |
| 7089 | - if ($curr_length <= $max_length) |
|
| 7090 | - return $array; |
|
| 7089 | + if ($curr_length <= $max_length) |
|
| 7090 | + return $array; |
|
| 7091 | 7091 | |
| 7092 | - else |
|
| 7093 | - { |
|
| 7094 | - // Truncate each element's value to a reasonable length |
|
| 7095 | - $param_max = floor($max_length / count($array)); |
|
| 7092 | + else |
|
| 7093 | + { |
|
| 7094 | + // Truncate each element's value to a reasonable length |
|
| 7095 | + $param_max = floor($max_length / count($array)); |
|
| 7096 | 7096 | |
| 7097 | - $current_deep = $deep - 1; |
|
| 7097 | + $current_deep = $deep - 1; |
|
| 7098 | 7098 | |
| 7099 | - foreach ($array as $key => &$value) |
|
| 7100 | - { |
|
| 7101 | - if (is_array($value)) |
|
| 7102 | - if ($current_deep > 0) |
|
| 7103 | - $value = truncate_array($value, $current_deep); |
|
| 7099 | + foreach ($array as $key => &$value) |
|
| 7100 | + { |
|
| 7101 | + if (is_array($value)) |
|
| 7102 | + if ($current_deep > 0) |
|
| 7103 | + $value = truncate_array($value, $current_deep); |
|
| 7104 | 7104 | |
| 7105 | - else |
|
| 7106 | - $value = substr($value, 0, $param_max - strlen($key) - 5); |
|
| 7107 | - } |
|
| 7105 | + else |
|
| 7106 | + $value = substr($value, 0, $param_max - strlen($key) - 5); |
|
| 7107 | + } |
|
| 7108 | 7108 | |
| 7109 | - return $array; |
|
| 7110 | - } |
|
| 7109 | + return $array; |
|
| 7110 | + } |
|
| 7111 | 7111 | } |
| 7112 | 7112 | |
| 7113 | 7113 | /** |
@@ -7118,29 +7118,29 @@ discard block |
||
| 7118 | 7118 | */ |
| 7119 | 7119 | function array_length($array, $deep = 3) |
| 7120 | 7120 | { |
| 7121 | - // Work with arrays |
|
| 7122 | - $array = (array) $array; |
|
| 7123 | - $length = 0; |
|
| 7121 | + // Work with arrays |
|
| 7122 | + $array = (array) $array; |
|
| 7123 | + $length = 0; |
|
| 7124 | 7124 | |
| 7125 | - $deep_count = $deep - 1; |
|
| 7125 | + $deep_count = $deep - 1; |
|
| 7126 | 7126 | |
| 7127 | - foreach ($array as $value) |
|
| 7128 | - { |
|
| 7129 | - // Recursive? |
|
| 7130 | - if (is_array($value)) |
|
| 7131 | - { |
|
| 7132 | - // No can't do |
|
| 7133 | - if ($deep_count <= 0) |
|
| 7134 | - continue; |
|
| 7127 | + foreach ($array as $value) |
|
| 7128 | + { |
|
| 7129 | + // Recursive? |
|
| 7130 | + if (is_array($value)) |
|
| 7131 | + { |
|
| 7132 | + // No can't do |
|
| 7133 | + if ($deep_count <= 0) |
|
| 7134 | + continue; |
|
| 7135 | 7135 | |
| 7136 | - $length += array_length($value, $deep_count); |
|
| 7137 | - } |
|
| 7136 | + $length += array_length($value, $deep_count); |
|
| 7137 | + } |
|
| 7138 | 7138 | |
| 7139 | - else |
|
| 7140 | - $length += strlen($value); |
|
| 7141 | - } |
|
| 7139 | + else |
|
| 7140 | + $length += strlen($value); |
|
| 7141 | + } |
|
| 7142 | 7142 | |
| 7143 | - return $length; |
|
| 7143 | + return $length; |
|
| 7144 | 7144 | } |
| 7145 | 7145 | |
| 7146 | 7146 | ?> |
| 7147 | 7147 | \ No newline at end of file |