From 9f1108e52e4787610a488868d774992e1ca28979 Mon Sep 17 00:00:00 2001 From: Frank de Jonge Date: Tue, 5 Nov 2013 11:27:16 +0100 Subject: [PATCH 1/2] Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it. --- phpseclib/Crypt/Random.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/phpseclib/Crypt/Random.php b/phpseclib/Crypt/Random.php index 948512da..f7cdc7c5 100644 --- a/phpseclib/Crypt/Random.php +++ b/phpseclib/Crypt/Random.php @@ -21,10 +21,10 @@ * 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 @@ -46,7 +46,9 @@ * * @access private */ -define('CRYPT_RANDOM_IS_WINDOWS', strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); +if (defined('CRYPT_RANDOM_IS_WINDOWS') === false) { + define('CRYPT_RANDOM_IS_WINDOWS', strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); +} /** * Generate a random string. From 4976cd16226ad432e6973038d4611890fd71297e Mon Sep 17 00:00:00 2001 From: Frank de Jonge Date: Tue, 5 Nov 2013 13:01:03 +0100 Subject: [PATCH 2/2] Fixed coding style to comply with other not defined statements --- phpseclib/Crypt/Random.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpseclib/Crypt/Random.php b/phpseclib/Crypt/Random.php index f7cdc7c5..e38bdf8d 100644 --- a/phpseclib/Crypt/Random.php +++ b/phpseclib/Crypt/Random.php @@ -46,7 +46,7 @@ * * @access private */ -if (defined('CRYPT_RANDOM_IS_WINDOWS') === false) { +if (!defined('CRYPT_RANDOM_IS_WINDOWS')) { define('CRYPT_RANDOM_IS_WINDOWS', strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'); }