Merge pull request #93 from paragonie-scott/without-opensslorigin/without-openssl

Create an OpenSSL-free branch

3 files changed, 2 insertions, 90 deletions

diff --git a/lib/random.php b/lib/random.php
index c77e0a0..2157a02 100644
--- a/lib/random.php
+++ b/lib/random.php
@@ -171,6 +171,7 @@ if (PHP_VERSION_ID < 70000) {
         /**
          * openssl_random_pseudo_bytes()
          */
+        /*
         if (
             (
                 // Unix-like with PHP >= 5.3.0 or
@@ -191,6 +192,7 @@ if (PHP_VERSION_ID < 70000) {
             // See random_bytes_openssl.php
             require_once $RandomCompatDIR.'/random_bytes_openssl.php';
         }
+        */
 
         /**
          * throw new Exception
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/openssl.php
deleted file mode 100644
index 2f4acce..0000000
--- a/tests/specific/openssl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$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_int.php';
\ No newline at end of file