iqb / ecryptfs

src/StreamWrapper.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
     private $position;
 
 
-    public function stream_open(string $path, string $mode, int $options, string &$opened_path = null) : bool
+    public function stream_open(string $path, string $mode, int $options, string & $opened_path = null) : bool
     {
         $prefix = self::STREAM_NAME . '://';
 
@@ -135,7 +135,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);
 

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/Util.php

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
     {
         $key = \hash(self::KEY_DERIVATION_ALGO, \substr($salt, 0, ECRYPTFS_SALT_SIZE) . $passPhrase, true);
 
-        for ($i=1; $i<self::DEFAULT_NUM_HASH_ITERATIONS; $i++) {
+        for ($i = 1; $i < self::DEFAULT_NUM_HASH_ITERATIONS; $i++) {
             $key = \hash(self::KEY_DERIVATION_ALGO, $key, true);
         }
 
@@ -119,7 +119,7 @@ 
      * @param int $pos
      * @return int
      */
-    final public static function parseTagPacketLength(string $data, int &$pos = 0) : int
+    final public static function parseTagPacketLength(string $data, int & $pos = 0) : int
     {
         $packetSize = \ord($data[$pos]);
         if ($packetSize > 224) {
@@ -149,7 +149,7 @@ 
             throw new \InvalidArgumentException("Length must be an unsigned integer.");
         }
 
-        if ($length > (32*256 + 255)) {
+        if ($length > (32 * 256 + 255)) {
             throw new \InvalidArgumentException("Length too large.");
         }
 
@@ -172,7 +172,7 @@ 
      */
     public static function isEncryptedFilename(string $filename) : bool
     {
-        return (\substr(\basename($filename), 0, \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX )) === self::FNEK_ENCRYPTED_FILENAME_PREFIX);
+        return (\substr(\basename($filename), 0, \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX)) === self::FNEK_ENCRYPTED_FILENAME_PREFIX);
     }
 
 
@@ -191,7 +191,7 @@ 
     public static function encryptFilename(CryptoEngineInterface $cryptoEngine, string $filename, string $fnek, int $cipherCode = Tag70Packet::DEFAULT_CIPHER, int $cipherKeySize = null) : string
     {
         $tag = Tag70Packet::generate($cryptoEngine, $filename, $fnek, $cipherCode, $cipherKeySize);
-        return self::FNEK_ENCRYPTED_FILENAME_PREFIX  . BaseConverter::encode($tag->dump());
+        return self::FNEK_ENCRYPTED_FILENAME_PREFIX . BaseConverter::encode($tag->dump());
     }
 
 
@@ -205,7 +205,7 @@ 
         }
 
         $dirname = \dirname($filename);
-        $decoded = BaseConverter::decode(\substr(\basename($filename), \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX )));
+        $decoded = BaseConverter::decode(\substr(\basename($filename), \strlen(self::FNEK_ENCRYPTED_FILENAME_PREFIX)));
         $tag = Tag70Packet::parse($decoded);
         $tag->decrypt($cryptoEngine, $key);
 

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/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -141,11 +141,11 @@ 
     {
         $key = \hash(ECRYPTFS_KEY_DERIVATION_ALGO, \substr($salt, 0, ECRYPTFS_SALT_SIZE) . $passphrase, true);
         
-        for ($i=1; $i<ECRYPTFS_DEFAULT_NUM_HASH_ITERATIONS; $i++) {
+        for ($i = 1; $i < ECRYPTFS_DEFAULT_NUM_HASH_ITERATIONS; $i++) {
             $key = \hash(ECRYPTFS_KEY_DERIVATION_ALGO, $key, true);
         }
         
-        $signature = \substr(\hash(ECRYPTFS_KEY_DERIVATION_ALGO, $key, false), 0, ECRYPTFS_SIG_SIZE*2);
+        $signature = \substr(\hash(ECRYPTFS_KEY_DERIVATION_ALGO, $key, false), 0, ECRYPTFS_SIG_SIZE * 2);
         $this->keys[$signature] = \bin2hex($key);
         
         return $signature;
@@ -271,7 +271,7 @@ 
             $algo = "AES-256-ECB";
         }
         
-        if (false === ($decrypted = \openssl_decrypt($data, $algo, $key, \OPENSSL_RAW_DATA|\OPENSSL_NO_PADDING, $iv))) {
+        if (false === ($decrypted = \openssl_decrypt($data, $algo, $key, \OPENSSL_RAW_DATA | \OPENSSL_NO_PADDING, $iv))) {
             throw new \DomainException("Decryption failed with error: " . \openssl_error_string());
         }