From 3c7dd2822b2a745725f8c2d70b07167d006498d6 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 6 Jul 2011 14:08:50 -0700 Subject: [PATCH] Trimming comment bloat in Crypt class. --- system/crypt.php | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/system/crypt.php b/system/crypt.php index fc338de9..4174251b 100644 --- a/system/crypt.php +++ b/system/crypt.php @@ -24,10 +24,6 @@ class Crypt { */ public static function encrypt($value) { - // ----------------------------------------------------- - // Determine the input vector source. Different servers - // and operating systems will have varying options. - // ----------------------------------------------------- if (defined('MCRYPT_DEV_URANDOM')) { $random = MCRYPT_DEV_URANDOM; @@ -41,21 +37,17 @@ public static function encrypt($value) $random = MCRYPT_RAND; } - // ----------------------------------------------------- - // The system random number generator must be seeded - // to produce adequately random results. - // ----------------------------------------------------- + // The system random number generator must be seeded to produce random results. if ($random === MCRYPT_RAND) { mt_srand(); } $iv = mcrypt_create_iv(static::iv_size(), $random); + $value = mcrypt_encrypt(static::$cipher, static::key(), $value, static::$mode, $iv); - // ----------------------------------------------------- - // We use base64 encoding to get a nice string value. - // ----------------------------------------------------- + // Use base64 encoding to get a nice string value. return base64_encode($iv.$value); } @@ -67,10 +59,6 @@ public static function encrypt($value) */ public static function decrypt($value) { - // ----------------------------------------------------- - // Since all of our encrypted values are base64 encoded, - // we will decode the value here and verify it. - // ----------------------------------------------------- $value = base64_decode($value, true); if ( ! $value) @@ -78,14 +66,10 @@ public static function decrypt($value) throw new \Exception('Decryption error. Input value is not valid base64 data.'); } - // ----------------------------------------------------- // Extract the input vector from the value. - // ----------------------------------------------------- $iv = substr($value, 0, static::iv_size()); - // ----------------------------------------------------- // Remove the input vector from the encrypted value. - // ----------------------------------------------------- $value = substr($value, static::iv_size()); return rtrim(mcrypt_decrypt(static::$cipher, static::key(), $value, static::$mode, $iv), "\0");