dittertp / gibberish-aes-php

src/GibberishAES/GibberishAES.php

Doc Comments +21 added lines, -1 removed lines

@@ -85,7 +85,7 @@ 
      *                              (64 characters for example) for keeping high entropy.
      *                              The pass-phrase is converted internaly into
      *                              a binary key that is to be used for encryption.
-     * @return  mixed               base64 encrypted string, FALSE on failure.
+     * @return  string|false               base64 encrypted string, FALSE on failure.
      */
     public static function enc($string, $pass) {
 
@@ -283,6 +283,10 @@ 
         return self::mbstring_func_overload() ? mb_strlen($str, '8bit') : strlen($str);
     }
 
+    /**
+     * @param integer $start
+     * @param integer $length
+     */
     protected static function substr($str, $start, $length = null) {
 
         if (self::mbstring_func_overload()) {
@@ -296,6 +300,9 @@ 
         return isset($length) ? substr($str, $start, $length) : substr($str, $start);
     }
 
+    /**
+     * @param integer $length
+     */
     protected static function random_bytes($length) {
 
         $length = (int) $length;
@@ -440,6 +447,11 @@ 
          */
     }
 
+    /**
+     * @param string $string
+     * @param string $key
+     * @param string $iv
+     */
     protected static function aes_cbc_encrypt($string, $key, $iv) {
 
         $key_size = self::$key_size;
@@ -472,6 +484,11 @@ 
         return false;
     }
 
+    /**
+     * @param string $crypted
+     * @param string $key
+     * @param string $iv
+     */
     protected static function aes_cbc_decrypt($crypted, $key, $iv) {
 
         $key_size = self::$key_size;
@@ -512,6 +529,9 @@ 
         return $string.str_repeat(chr($pad), $pad);
     }
 
+    /**
+     * @param string $string
+     */
     protected static function remove_pkcs7_pad($string) {
 
         // 128 bits: $block_length = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);

Spacing +5 added lines, -5 removed lines

@@ -379,10 +379,10 @@ 
             $bytes = ($total > $hash_len) ? $hash_len : $total;
             $total -= $bytes;
             //collect any entropy available from the PHP system and filesystem
-            $entropy = rand() . uniqid(mt_rand(), true) . $SSLstr;
+            $entropy = rand().uniqid(mt_rand(), true).$SSLstr;
             $entropy .= implode('', @fstat(@fopen(__FILE__, 'r')));
-            $entropy .= memory_get_usage() . getmypid();
-            $entropy .= serialize($_ENV) . serialize($_SERVER);
+            $entropy .= memory_get_usage().getmypid();
+            $entropy .= serialize($_ENV).serialize($_SERVER);
             if (function_exists('posix_times')) {
                 $entropy .= serialize(posix_times());
             }
@@ -400,7 +400,7 @@ 
                         $var = sha1($var);
                     }
                     $c2 = microtime(true);
-                    $entropy .= $c1 . $c2;
+                    $entropy .= $c1.$c2;
                 }
                 // Based on the above measurement determine the total rounds
                 // in order to bound the total running time.
@@ -415,7 +415,7 @@ 
                         $var = sha1($var);
                     }
                     $c2 = microtime();
-                    $entropy .= $c1 . $c2;
+                    $entropy .= $c1.$c2;
                 }
             }
             // We assume sha1 is a deterministic extractor for the $entropy variable.

Braces +2 added lines, -4 removed lines

@@ -216,8 +216,7 @@ 
                 {
                     $test = random_bytes(1);
                     self::$random_bytes_exists = true;
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     // Do nothing.
                 }
             }
@@ -305,8 +304,7 @@ 
             try
             {
                 return random_bytes($length);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 // Do nothing, continue.
             }
         }