paragonie / random_compat

lib/random_bytes_libsodium_legacy.php

Indentation +25 added lines, -25 removed lines

@@ -1,30 +1,30 @@
 <?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.
- */
+     * 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 

lib/random.php

Doc Comments +1 added lines

@@ -165,6 +165,7 @@
             /**
              * We don't have any more options, so let's throw an exception right now
              * and hope the developer won't let it fail silently.
+             * @param integer $length
              */
             function random_bytes($length)
             {

Spacing +10 added lines, -10 removed lines

@@ -46,9 +46,9 @@ 
 
     $RandomCompatDIR = dirname(__FILE__);
 
-    require_once $RandomCompatDIR.'/byte_safe_strings.php';
-    require_once $RandomCompatDIR.'/cast_to_int.php';
-    require_once $RandomCompatDIR.'/error_polyfill.php';
+    require_once $RandomCompatDIR . '/byte_safe_strings.php';
+    require_once $RandomCompatDIR . '/cast_to_int.php';
+    require_once $RandomCompatDIR . '/error_polyfill.php';
 
     if (!function_exists('random_bytes')) {
         /**
@@ -69,9 +69,9 @@ 
         if (extension_loaded('libsodium')) {
             // See random_bytes_libsodium.php
             if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
-                require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+                require_once $RandomCompatDIR . '/random_bytes_libsodium.php';
             } elseif (method_exists('Sodium', 'randombytes_buf')) {
-                require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
+                require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.php';
             }
         }
 
@@ -110,7 +110,7 @@ 
                 // place, that is not helpful to us here.
 
                 // See random_bytes_dev_urandom.php
-                require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
+                require_once $RandomCompatDIR . '/random_bytes_dev_urandom.php';
             }
             // Unset variables after use
             $RandomCompat_basedir = null;
@@ -134,7 +134,7 @@ 
                 (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
             ) {
                 // See random_bytes_mcrypt.php
-                require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
+                require_once $RandomCompatDIR . '/random_bytes_mcrypt.php';
             }
         }
 
@@ -155,7 +155,7 @@ 
                     $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                     if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
                         // See random_bytes_com_dotnet.php
-                        require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+                        require_once $RandomCompatDIR . '/random_bytes_com_dotnet.php';
                     }
                 } catch (com_exception $e) {
                     // Don't try to use it.
@@ -186,7 +186,7 @@ 
             extension_loaded('openssl')
         ) {
             // See random_bytes_openssl.php
-            require_once $RandomCompatDIR.'/random_bytes_openssl.php';
+            require_once $RandomCompatDIR . '/random_bytes_openssl.php';
         }
 
         /**
@@ -207,7 +207,7 @@ 
     }
 
     if (!function_exists('random_int')) {
-        require_once $RandomCompatDIR.'/random_int.php';
+        require_once $RandomCompatDIR . '/random_int.php';
     }
 
     $RandomCompatDIR = null;

Indentation +28 added lines, -28 removed lines

@@ -1,33 +1,33 @@
 <?php
 /**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * @version 1.2.2
- * @released 2016-03-11
- *
- * 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.
- */
+     * Random_* Compatibility Library
+     * for using the new PHP 7 random_* API in PHP 5 projects
+     * 
+     * @version 1.2.2
+     * @released 2016-03-11
+     *
+     * 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.
+     */
 
 if (!defined('PHP_VERSION_ID')) {
     // This constant was introduced in PHP 5.2.7