nilsteampassnet / TeamPass

includes/libraries/Pdf/Tfpdf/font/courierb.php

Braces +2 added lines, -1 removed lines

@@ -3,6 +3,7 @@
 $name = 'Courier-Bold';
 $up = -100;
 $ut = 50;
-for ($i = 0; $i <= 255; $i++)
+for ($i = 0; $i <= 255; $i++) {
 	$cw[chr($i)] = 600;
+}
 ?>

includes/libraries/Encryption/PBKDF2/PasswordHashClass.php

Braces +14 added lines, -10 removed lines

@@ -59,8 +59,9 @@ 
     public static function validate_password($password, $good_hash)
     {
         $params = explode(":", $good_hash);
-        if (count($params) < HASH_SECTIONS)
-            return false;
+        if (count($params) < HASH_SECTIONS) {
+                    return false;
+        }
         $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
         return self::slow_equals(
             $pbkdf2,
@@ -113,10 +114,12 @@ 
     private static function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
     {
         $algorithm = strtolower($algorithm);
-        if (!in_array($algorithm, hash_algos(), true))
-            trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-        if ($count <= 0 || $key_length <= 0)
-            trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+        if (!in_array($algorithm, hash_algos(), true)) {
+                    trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
+        }
+        if ($count <= 0 || $key_length <= 0) {
+                    trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+        }
 
         if (function_exists("hash_pbkdf2")) {
             // The output length is in NIBBLES (4-bits) if $raw_output is false!
@@ -142,10 +145,11 @@ 
             $output .= $xorsum;
         }
 
-        if ($raw_output)
-            return substr($output, 0, $key_length);
-        else
-            return bin2hex(substr($output, 0, $key_length));
+        if ($raw_output) {
+                    return substr($output, 0, $key_length);
+        } else {
+                    return bin2hex(substr($output, 0, $key_length));
+        }
     }
 }
 ?>
\ No newline at end of file

includes/libraries/Encryption/PBKDF2/PasswordHash.php

Braces +15 added lines, -11 removed lines

@@ -57,8 +57,9 @@ 
 function validate_password($password, $correct_hash)
 {
     $params = explode(":", $correct_hash);
-    if (count($params) < HASH_SECTIONS)
-        return false;
+    if (count($params) < HASH_SECTIONS) {
+            return false;
+    }
     $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
     return slow_equals(
         $pbkdf2,
@@ -108,10 +109,12 @@ 
 function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
 {
     $algorithm = strtolower($algorithm);
-    if (!in_array($algorithm, hash_algos(), true))
-        trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-    if ($count <= 0 || $key_length <= 0)
-        trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+    if (!in_array($algorithm, hash_algos(), true)) {
+            trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
+    }
+    if ($count <= 0 || $key_length <= 0) {
+            trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+    }
 
     if (function_exists("hash_pbkdf2")) {
         // The output length is in NIBBLES (4-bits) if $raw_output is false!
@@ -137,9 +140,10 @@ 
         $output .= $xorsum;
     }
 
-    if ($raw_output)
-        return substr($output, 0, $key_length);
-    else
-        return bin2hex(substr($output, 0, $key_length));
-}
+    if ($raw_output) {
+            return substr($output, 0, $key_length);
+    } else {
+            return bin2hex(substr($output, 0, $key_length));
+    }
+    }
 ?>
\ No newline at end of file

includes/libraries/phpcrypt/Padding.php

Braces +20 added lines, -15 removed lines

@@ -67,8 +67,9 @@ 
 	{
 		// if the size of padding is not greater than 1
 		// just return true, no padding will be done
-		if (!($bytes > 0))
-			return true;
+		if (!($bytes > 0)) {
+					return true;
+		}
 
 		switch ($type)
 		{
@@ -196,11 +197,11 @@ 
 		$pos = strlen($text) - 1;
 		$c = ord($text[$pos]);
 
-		if ($c == 0)
-			return true;
-		else if ($c == 1)
-			$text = substr($text, 0, -1);
-		else
+		if ($c == 0) {
+					return true;
+		} else if ($c == 1) {
+					$text = substr($text, 0, -1);
+		} else
 		{
 			// the total null bytes are 1 less than the value of the final byte
 			$nc = $c - 1;
@@ -226,8 +227,9 @@ 
 		// create the random pad bytes, we do one less than
 		// needed because the last byte is reserved for the
 		// number of padded bytes
-		for ($i = 0; $i < ($bytes - 1); ++$i)
-			$text .= chr(mt_rand(0, 255));
+		for ($i = 0; $i < ($bytes - 1); ++$i) {
+					$text .= chr(mt_rand(0, 255));
+		}
 
 		// add the byte to indicate the padding length
 		$text .= chr($bytes);
@@ -248,8 +250,9 @@ 
 
 		// if we got a null byte at the end of the string,
 		// just return
-		if ($c == 0)
-			return true;
+		if ($c == 0) {
+					return true;
+		}
 
 		$text = substr($text, 0, $c);
 		return true;
@@ -285,8 +288,9 @@ 
 		$pos = strlen($text) - 1;
 		$c = ord($text[$pos]);
 
-		if ($c == 0)
-			return true;
+		if ($c == 0) {
+					return true;
+		}
 
 		$text = preg_replace('/'.preg_quote(chr($c)).'{'.$c.'}$/', "", $text);
 		return true;
@@ -309,8 +313,9 @@ 
 
 		// if we are only padding one byte, then 0x80 is all we need
 		// else we follow up with null bytes
-		if ($bytes > 1)
-			$text = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+		if ($bytes > 1) {
+					$text = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+		}
 
 		return true;
 	}

includes/libraries/phpcrypt/ciphers/RC2.php

Braces +6 added lines, -4 removed lines

@@ -276,8 +276,9 @@ 
         $len = $this->keySize();
 
         // the max length of the key is 128 bytes
-        if($len > 128)
-            $this->xkey = substr($this->xkey, 0, 128);
+        if($len > 128) {
+                    $this->xkey = substr($this->xkey, 0, 128);
+        }
 
         // now expanded the rest of the key to 128 bytes, using the sbox
         for($i = $len; $i < 128; ++$i)
@@ -288,8 +289,9 @@ 
 
             // the sbox is only 255 bytes, so if we extend past that
             // we need to modulo 256 so we have a valid position
-            if($pos > 255)
-                $pos -= 256;
+            if($pos > 255) {
+                            $pos -= 256;
+            }
 
             $this->xkey .= chr(self::$_sbox[$pos]);
         }

includes/libraries/phpcrypt/ciphers/Enigma.php

Braces +15 added lines, -10 removed lines

@@ -158,8 +158,9 @@ 
                 $this->n1 = 0;
                 $this->n2++;
 
-                if($this->n2 == self::ROTORSZ)
-                    $this->n2 = 0;
+                if($this->n2 == self::ROTORSZ) {
+                                    $this->n2 = 0;
+                }
 
                 $this->nr2 = $this->n2;
             }
@@ -189,12 +190,14 @@ 
         $klen = $this->keySize();
 
         // get the key to exactly 13 bytes if it's less than 13
-        if($klen < 13)
-            $this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+        if($klen < 13) {
+                    $this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+        }
 
         $seed = 123;
-        for($i = 0; $i < 13; ++$i)
-            $seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+        for($i = 0; $i < 13; ++$i) {
+                    $seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+        }
 
         // sets $t1 and $deck
         for($i = 0; $i < self::ROTORSZ; ++$i)
@@ -223,12 +226,14 @@ 
             $temp = $this->t1[$k];
             $this->t1[$k] = $this->t1[$ic];
             $this->t1[$ic] = $temp;
-            if($this->t3[$k] != 0)
-                continue;
+            if($this->t3[$k] != 0) {
+                            continue;
+            }
 
             $ic = ($random & self::MASK) % $k;
-            while($this->t3[$ic] != 0)
-                $ic = ($ic + 1) % $k;
+            while($this->t3[$ic] != 0) {
+                            $ic = ($ic + 1) % $k;
+            }
 
             $this->t3[$k] = $ic;
             $this->t3[$ic] = $k;

includes/libraries/phpcrypt/ciphers/SimpleXOR.php

Braces +3 added lines, -2 removed lines

@@ -121,8 +121,9 @@
 		{
 			// if the current position in the key reaches the end of the key,
 			// start over at position 0 of the key
-			if ($pos >= $this->keySize())
-				$pos = 0;
+			if ($pos >= $this->keySize()) {
+							$pos = 0;
+			}
 
 			$text[$i] = $text[$i] ^ $key[$pos];
 			++$pos;

includes/libraries/phpcrypt/ciphers/Blowfish.php

Braces +16 added lines, -20 removed lines

@@ -79,8 +79,7 @@ 
         {
             $key = substr($key, 0, 56);
             $keylen = 56;
-        }
-        else if($keylen < 1)
+        } else if($keylen < 1)
         {
             $msg  = "No key given. The key must be between 1 - 56 bytes.";
             trigger_error($msg, E_USER_WARNING);
@@ -148,10 +147,11 @@ 
 
         for($i = 0; $i < 16; ++$i)
         {
-            if($this->operation() == parent::ENCRYPT)
-                $xl ^= self::$_p[$i];
-            else
-                $xl ^= self::$_p[17-$i];
+            if($this->operation() == parent::ENCRYPT) {
+                            $xl ^= self::$_p[$i];
+            } else {
+                            $xl ^= self::$_p[17-$i];
+            }
 
             // perform F() on the left half, and XOR with the right half
             $xr = $this->F($xl) ^ $xr;
@@ -172,8 +172,7 @@ 
         {
             $xr ^= self::$_p[16];
             $xl  = $xl ^ self::$_p[17];
-        }
-        else // parent::DECRYPT
+        } else // parent::DECRYPT
         {
             $xr ^= self::$_p[1];
             $xl ^= self::$_p[0];
@@ -243,23 +242,19 @@ 
             {
                 self::$_p[$i] = $z0;
                 self::$_p[$i + 1] = $z1;
-            }
-            else if($i >= 18 && $i < 274)
+            } else if($i >= 18 && $i < 274)
             {
                 self::$_sbox1[$i - 18] = $z0;
                 self::$_sbox1[$i - 18 + 1] = $z1;
-            }
-            else if($i >= 274 && $i < 530)
+            } else if($i >= 274 && $i < 530)
             {
                 self::$_sbox2[$i - 274] = $z0;
                 self::$_sbox2[$i - 274 + 1] = $z1;
-            }
-            else if($i >= 530 && $i < 786)
+            } else if($i >= 530 && $i < 786)
             {
                 self::$_sbox3[$i - 530] = $z0;
                 self::$_sbox3[$i - 530 + 1] = $z1;
-            }
-            else if($i >= 786 && $i < 1042)
+            } else if($i >= 786 && $i < 1042)
             {
                 self::$_sbox4[$i -786] = $z0;
                 self::$_sbox4[$i - 786 + 1] = $z1;
@@ -284,8 +279,9 @@ 
      */
     private function keyChunk($size = 1, $reset = false)
     {
-        if($reset || $this->key_pos >= $this->keySize())
-            $this->key_pos = 0;
+        if($reset || $this->key_pos >= $this->keySize()) {
+                    $this->key_pos = 0;
+        }
 
         $bytes = substr($this->key(), $this->key_pos, $size);
         $len = strlen($bytes);
@@ -293,9 +289,9 @@ 
         {
             $bytes .= substr($this->key(), 0, $size - $len);
             $this->key_pos = $size - $len;
+        } else {
+                    $this->key_pos += $size;
         }
-        else
-            $this->key_pos += $size;
 
         return $bytes;
     }

includes/libraries/phpcrypt/ciphers/CAST256.php

Braces +4 added lines, -4 removed lines

@@ -81,8 +81,7 @@ 
 		{
 			$key = substr($key, 0, self::BYTES_KEY_MAX);
 			$keylen = self::BYTES_KEY_MAX;
-		}
-		else if (!in_array($keylen, self::$_req_key_sizes))
+		} else if (!in_array($keylen, self::$_req_key_sizes))
 		{
 			$msg  = PHP_Crypt::CIPHER_CAST_256." requires a key size of 16, ";
 			$msg .= "20, 24, 28, or 32 bytes.";
@@ -298,8 +297,9 @@ 
 
 		// if the key is less than 32 bytes, pad it to 32 bytes
 		// for the key expansion
-		if ($this->keySize() < 32)
-			$xkey = str_pad($xkey, 32, "\0", STR_PAD_RIGHT);
+		if ($this->keySize() < 32) {
+					$xkey = str_pad($xkey, 32, "\0", STR_PAD_RIGHT);
+		}
 
 		// split the key up into 4 byte parts, reverse the string,
 		// then convert each part into a 32 bit integer