iqb / ecryptfs

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);

src/Tag70Packet.php

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

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) {