iqb / ecryptfs

src/OpenSslCryptoEngine.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
         $cipher = self::CIPHER_MAPPING[$cipherCode];
 
-        if (false === ($encrypted = \openssl_encrypt($data, $cipher, $key, \OPENSSL_RAW_DATA|\OPENSSL_NO_PADDING, $iv))) {
+        if (false === ($encrypted = \openssl_encrypt($data, $cipher, $key, \OPENSSL_RAW_DATA | \OPENSSL_NO_PADDING, $iv))) {
             throw new \RuntimeException("Encryption failed with error: " . \openssl_error_string());
         }
 
@@ -56,7 +56,7 @@ 
 
         $cipher = self::CIPHER_MAPPING[$cipherCode];
 
-        if (false === ($decrypted = \openssl_decrypt($data, $cipher, $key, \OPENSSL_RAW_DATA|\OPENSSL_NO_PADDING, $iv))) {
+        if (false === ($decrypted = \openssl_decrypt($data, $cipher, $key, \OPENSSL_RAW_DATA | \OPENSSL_NO_PADDING, $iv))) {
             throw new \RuntimeException("Decryption failed with error: " . \openssl_error_string());
         }
 

src/BaseConverter.php

Spacing +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
         $dstByteOffset = 0;
         $dst = [];
 
-        for ($srcByteOffset=0; $srcByteOffset<$srcSize; $srcByteOffset++) {
+        for ($srcByteOffset = 0; $srcByteOffset < $srcSize; $srcByteOffset++) {
             $byte = self::FILENAME_REVERSE_MAPPING[\ord($encoded[$srcByteOffset])];
 
             switch ($currentBitOffset) {
@@ -100,11 +100,11 @@ 
         }
 
         $encoded = '';
-        for ($i=0; $i<$inputLength; $i+=3) {
+        for ($i = 0; $i < $inputLength; $i += 3) {
             $code1 = (\ord($decoded[$i]) >> 2) & 0x3F;
-            $code2 = ((\ord($decoded[$i]) << 4) & 0x30) | ((\ord($decoded[$i+1]) >> 4) & 0x0F);
-            $code3 = ((\ord($decoded[$i+1]) << 2) & 0x3C) | ((\ord($decoded[$i+2]) >> 6) & 0x03);
-            $code4 = \ord($decoded[$i+2]) & 0x3F;
+            $code2 = ((\ord($decoded[$i]) << 4) & 0x30) | ((\ord($decoded[$i + 1]) >> 4) & 0x0F);
+            $code3 = ((\ord($decoded[$i + 1]) << 2) & 0x3C) | ((\ord($decoded[$i + 2]) >> 6) & 0x03);
+            $code4 = \ord($decoded[$i + 2]) & 0x3F;
 
             $encoded .= self::PORTABLE_FILENAME_CHARS[$code1];
             $encoded .= self::PORTABLE_FILENAME_CHARS[$code2];

src/Tag3Packet.php

Indentation +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
     public function generate() : string
     {
         return
-              \chr(Tag3Packet::PACKET_TYPE)
+                \chr(Tag3Packet::PACKET_TYPE)
             . Util::generateTagPacketLength(\strlen($this->encryptedKey) + ECRYPTFS_SALT_SIZE + 5)
             . \chr(Tag3Packet::PACKET_VERSION)
             . \chr($this->cipherCode)
@@ -175,7 +175,7 @@ 
         $cur += ECRYPTFS_SALT_SIZE;
 
         /* This conversion was taken straight from RFC2440 */
-	    $hashIterations = (16 + (\ord($data[$cur]) & 15)) << ((\ord($data[$cur]) >> 4) + 6);
+        $hashIterations = (16 + (\ord($data[$cur]) & 15)) << ((\ord($data[$cur]) >> 4) + 6);
         $cur++;
 
         $encryptedKey = \substr($data, $cur, $encryptedKeySize);

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
      *
      * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/fs/ecryptfs/keystore.c?h=v4.11.3#n1360
      */
-    public static function parse(string $data, int &$pos = 0) : self
+    public static function parse(string $data, int & $pos = 0) : self
     {
         $cur = $pos;
 

src/FileHeader.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
         $header->encryptedFileKey = $tag3->encryptedKey;
 
         if (!\in_array(\strlen($header->encryptedFileKey), CryptoEngineInterface::CIPHER_KEY_SIZES[$header->cipherCode])) {
-            throw new \RuntimeException(\sprintf("Invalid key size (%u bit) for cipher 0x%x detected, file header may be corrupt!", \strlen($header->encryptedFileKey)*8, $header->cipherCode));
+            throw new \RuntimeException(\sprintf("Invalid key size (%u bit) for cipher 0x%x detected, file header may be corrupt!", \strlen($header->encryptedFileKey) * 8, $header->cipherCode));
         }
 
         return $header;

src/Tag11Packet.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
             . \chr(self::FORMAT_SPECIFIER)
             . \chr(\strlen(self::PACKET_FILENAME))
             . self::PACKET_FILENAME
-            . \chr(0).\chr(0).\chr(0).\chr(0)
+            . \chr(0) . \chr(0) . \chr(0) . \chr(0)
             . $this->contents
         ;
     }
@@ -71,12 +71,12 @@ 
      * Try to parse a Tag11 packet from the supplied data string.
      * If the parsing was successfully, $pos will be incremented to point after the parsed data.
      */
-    public static function parse(string $data, int &$pos = 0) : self
+    public static function parse(string $data, int & $pos = 0) : self
     {
         $cur = $pos;
         $remaining = \strlen($data) - $cur;
 
-        if ($remaining < self::MIN_PACKET_LENGTH+2) {
+        if ($remaining < self::MIN_PACKET_LENGTH + 2) {
             throw new ParseException('Not enough data available to read for minimum packet length.');
         }
 
@@ -110,7 +110,7 @@ 
         }
         $cur += $filenameLength;
 
-        if (\substr($data, $cur, 4) !== \chr(0).\chr(0).\chr(0).\chr(0)) {
+        if (\substr($data, $cur, 4) !== \chr(0) . \chr(0) . \chr(0) . \chr(0)) {
             throw new ParseException('Expected file date to be zero.');
         }
         $cur += 4;

src/Tag70Packet.php

Spacing +3 added lines, -3 removed lines

@@ -182,7 +182,7 @@ 
         }
 
         if (!$correctKeySize) {
-            throw new \RuntimeException(\sprintf("Unable to decrypt filename, filename encryption key (FNEK) invalid or invalid key length for cipher 0x%x, tested key sizes: (%s)", $this->cipherCode, \implode(', ', \array_map(function($bytes) { return $bytes*8; }, $possibleCipherKeySizes))));
+            throw new \RuntimeException(\sprintf("Unable to decrypt filename, filename encryption key (FNEK) invalid or invalid key length for cipher 0x%x, tested key sizes: (%s)", $this->cipherCode, \implode(', ', \array_map(function($bytes) { return $bytes * 8; }, $possibleCipherKeySizes))));
         }
 
         list($this->padding, $this->decryptedFilename) = \explode("\0", $decrypted, 2);
@@ -264,7 +264,7 @@ 
         $prefix = '';
         $hash = $fnek;
 
-        for ($i=0; $i<\ceil($requiredBytes / self::DIGEST_SIZE); $i++) {
+        for ($i = 0; $i < \ceil($requiredBytes / self::DIGEST_SIZE); $i++) {
             $hash = \hash(self::DIGEST, $hash, true);
             $prefix .= $hash;
         }
@@ -291,7 +291,7 @@ 
      *
      * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/fs/ecryptfs/keystore.c?h=v4.11.3#n892
      */
-    public static function parse(string $data, int &$pos = 0) : self
+    public static function parse(string $data, int & $pos = 0) : self
     {
         $cur = $pos;
         $tag = new self();

Braces +2 added lines, -6 removed lines

@@ -205,13 +205,9 @@
     {
         if ($cipherKeySize === null) {
             $cipherKeySize = Util::findCipherKeySize($cipherCode, \strlen($fnek));
-        }
-
-        elseif (\strlen($fnek) < $cipherKeySize) {
+        } elseif (\strlen($fnek) < $cipherKeySize) {
             throw new \InvalidArgumentException(\şprintf("Supplied key has only %u bytes but %u bytes required for encryption.", \strlen($$fnek), $cipherKeySize));
-        }
-
-        elseif (!\in_array($cipherKeySize, CryptoEngineInterface::CIPHER_KEY_SIZES[$cipherCode])) {
+        } elseif (!\in_array($cipherKeySize, CryptoEngineInterface::CIPHER_KEY_SIZES[$cipherCode])) {
             throw new \InvalidArgumentException(\şprintf("Requested key size %u bytes is unsupported for cipher 0x%x.", $cipherKeySize, $cipherCode));
         }
 

src/CryptoEngineInterface.php

Spacing +8 added lines, -8 removed lines

@@ -33,20 +33,20 @@
      */
     const CIPHER_KEY_SIZES = [
         // Triple-DES (DES-EDE, as per spec - 168 bit key derived from 192)
-        RFC2440_CIPHER_DES3_EDE => [ 24 ],
+        RFC2440_CIPHER_DES3_EDE => [24],
         // CAST5 (128 bit key, as per RFC 2144)
-        RFC2440_CIPHER_CAST_5   => [ 16 ],
+        RFC2440_CIPHER_CAST_5   => [16],
         // Blowfish (128 bit key, 16 rounds)
-        RFC2440_CIPHER_BLOWFISH => [ 16 ],
+        RFC2440_CIPHER_BLOWFISH => [16],
         // AES with 128-bit key
-        RFC2440_CIPHER_AES_128  => [ 16 ],
+        RFC2440_CIPHER_AES_128  => [16],
         // AES with 192-bit key
-        RFC2440_CIPHER_AES_192  => [ 24 ],
+        RFC2440_CIPHER_AES_192  => [24],
         // AES with 256-bit key
-        RFC2440_CIPHER_AES_256  => [ 32 ],
+        RFC2440_CIPHER_AES_256  => [32],
         // Twofish with 256-bit key
-        RFC2440_CIPHER_TWOFISH  => [ 32, 24, 16 ],
-        RFC2440_CIPHER_CAST_6   => [ 32, 28, 24, 20, 16 ],
+        RFC2440_CIPHER_TWOFISH  => [32, 24, 16],
+        RFC2440_CIPHER_CAST_6   => [32, 28, 24, 20, 16],
     ];
 
     /**

src/constants.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n45
  */
-const FC2440_CIPHER_RSA       = 0x01;
+const FC2440_CIPHER_RSA = 0x01;
 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n36
@@ -26,7 +26,7 @@ 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n37
  */
-const RFC2440_CIPHER_CAST_5   = 0x03;
+const RFC2440_CIPHER_CAST_5 = 0x03;
 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n38
@@ -36,27 +36,27 @@ 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n39
  */
-const RFC2440_CIPHER_AES_128  = 0x07;
+const RFC2440_CIPHER_AES_128 = 0x07;
 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n40
  */
-const RFC2440_CIPHER_AES_192  = 0x08;
+const RFC2440_CIPHER_AES_192 = 0x08;
 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n41
  */
-const RFC2440_CIPHER_AES_256  = 0x09;
+const RFC2440_CIPHER_AES_256 = 0x09;
 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n42
  */
-const RFC2440_CIPHER_TWOFISH  = 0x0a;
+const RFC2440_CIPHER_TWOFISH = 0x0a;
 
 /**
  * @link https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/include/linux/ecryptfs.h#n43
  */
-const RFC2440_CIPHER_CAST_6   = 0x0b;
+const RFC2440_CIPHER_CAST_6 = 0x0b;
 
 /**
  * Number of raw bytes used from signature hash

src/StreamWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
         $startBlock = \floor(($this->position - $this->header->metadataSize) / $this->header->extentSize);
 
         $return = '';
-        for ($i=0; $i<$readBlocks && !$this->stream_eof(); $i++) {
+        for ($i = 0; $i < $readBlocks && !$this->stream_eof(); $i++) {
             $block = $startBlock + $i;
             $iv = \hash("md5", $this->header->rootIv . \str_pad("$block", 16, "\0", \STR_PAD_RIGHT), true);
 

Braces +1 added lines, -3 removed lines

@@ -121,9 +121,7 @@
         // Use stream from context or open file
         if (\array_key_exists(self::CONTEXT_STREAM, $myContext)) {
             $this->encrypted = $myContext[self::CONTEXT_STREAM];
-        }
-
-        else {
+        } else {
             $prefix = self::STREAM_NAME . '://';
 
             if (\substr($path, 0, \strlen($prefix)) !== $prefix) {