diff options
| -rwxr-xr-x | build-phar.sh | 5 | ||||
| -rw-r--r-- | lib/random.php | 24 | ||||
| -rw-r--r-- | lib/random_bytes_openssl.php | 83 | ||||
| -rw-r--r-- | tests/specific/libsodium_legacy.php (renamed from tests/specific/openssl.php) | 2 |
4 files changed, 6 insertions, 108 deletions
diff --git a/build-phar.sh b/build-phar.sh new file mode 100755 index 0000000..b4a5ba3 --- /dev/null +++ b/build-phar.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +basedir=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) ) + +php -dphar.readonly=0 "$basedir/other/build_phar.php" $*
\ No newline at end of file diff --git a/lib/random.php b/lib/random.php index 403eb95..3b8952f 100644 --- a/lib/random.php +++ b/lib/random.php @@ -173,30 +173,6 @@ if (PHP_VERSION_ID < 70000) { } /** - * openssl_random_pseudo_bytes() - */ - if ( - ( - // Unix-like with PHP >= 5.3.0 or - ( - DIRECTORY_SEPARATOR === '/' - && - PHP_VERSION_ID >= 50300 - ) - || - // Windows with PHP >= 5.4.1 - PHP_VERSION_ID >= 50401 - ) - && - !function_exists('random_bytes') - && - extension_loaded('openssl') - ) { - // See random_bytes_openssl.php - require_once $RandomCompatDIR.'/random_bytes_openssl.php'; - } - - /** * throw new Exception */ if (!function_exists('random_bytes')) { diff --git a/lib/random_bytes_openssl.php b/lib/random_bytes_openssl.php deleted file mode 100644 index 62bf770..0000000 --- a/lib/random_bytes_openssl.php +++ /dev/null @@ -1,83 +0,0 @@ -<?php -/** - * Random_* Compatibility Library - * for using the new PHP 7 random_* API in PHP 5 projects - * - * The MIT License (MIT) - * - * Copyright (c) 2015 Paragon Initiative Enterprises - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** - * Since openssl_random_pseudo_bytes() uses openssl's - * RAND_pseudo_bytes() API, which has been marked as deprecated by the - * OpenSSL team, this is our last resort before failure. - * - * @ref https://www.openssl.org/docs/crypto/RAND_bytes.html - * - * @param int $bytes - * - * @throws Exception - * - * @return string - */ -function random_bytes($bytes) -{ - try { - $bytes = RandomCompat_intval($bytes); - } catch (TypeError $ex) { - throw new TypeError( - 'random_bytes(): $bytes must be an integer' - ); - } - - if ($bytes < 1) { - throw new Error( - 'Length must be greater than 0' - ); - } - - /** - * $secure is passed by reference. If it's set to false, fail. Note - * that this will only return false if this function fails to return - * any data. - * - * @ref https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973 - */ - $secure = true; - $buf = openssl_random_pseudo_bytes($bytes, $secure); - if ( - $buf !== false - && - $secure - && - RandomCompat_strlen($buf) === $bytes - ) { - return $buf; - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/tests/specific/openssl.php b/tests/specific/libsodium_legacy.php index 2f4acce..e63b01d 100644 --- a/tests/specific/openssl.php +++ b/tests/specific/libsodium_legacy.php @@ -3,5 +3,5 @@ $ut_dir = dirname(dirname(__DIR__)); require_once $ut_dir.'/lib/byte_safe_strings.php'; require_once $ut_dir.'/lib/cast_to_int.php'; require_once $ut_dir.'/lib/error_polyfill.php'; -require_once $ut_dir.'/lib/random_bytes_openssl.php'; +require_once $ut_dir.'/lib/random_bytes_libsodium_legacy.php'; require_once $ut_dir.'/lib/random_int.php';
\ No newline at end of file |