Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserSecretStorage/UserSecretStorageTrait.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         if ($prefix === $this->encryption->get_type()) {
             // Decrypt the secret if it is prefixed with the current encryption type
             // Remove the encryption type prefix before decrypting
-           return $this->encryption->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->encryption->decrypt( substr($encryptedSecret, $pos+1) );
         }
 
         // Check the decryption array for the encryption type to see if there is an encryption

Spacing +3 added lines, -3 removed lines

@@ -54,13 +54,13 @@ 
         if ($prefix === $this->encryption->get_type()) {
             // Decrypt the secret if it is prefixed with the current encryption type
             // Remove the encryption type prefix before decrypting
-           return $this->encryption->decrypt( substr($encryptedSecret, $pos+1) );
+           return $this->encryption->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         // Check the decryption array for the encryption type to see if there is an encryption
         // instance defined for it. If so, use that to decrypt the secret.
         if (isset($this->decryption[$prefix])) {
-            return $this->decryption[$prefix]->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->decryption[$prefix]->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         $this->logger->error("Secret for user '$userId' is encrypted with unsupported encryption type '$prefix'");
@@ -77,6 +77,6 @@ 
     {
         $encryptedSecret = $this->encryption->encrypt($secret);
         // Prefix the user secret with the encryption type
-        $this->setUserSecret($userId, $this->encryption->get_type() . ':' . $encryptedSecret);
+        $this->setUserSecret($userId, $this->encryption->get_type().':'.$encryptedSecret);
     }
 }

library/tiqr/Tiqr/UserSecretStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      *
      * @return Tiqr_UserSecretStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, string $type="dummy", array $options=array()): Tiqr_UserSecretStorage_Encryption_Interface
+    public static function getEncryption(LoggerInterface $logger, string $type = "dummy", array $options = array()): Tiqr_UserSecretStorage_Encryption_Interface
     {
         $instance = null;
         $logger->info(sprintf('Using "%s" as UserSecretStorage encryption type', $type));

library/tiqr/Tiqr/UserSecretStorage/Encryption/OpenSSL.php

Indentation +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
     }
     
     /**
-      * Decrypts the given data.
+     * Decrypts the given data.
      *
      * @param string $data Data to decrypt.
      * @return string decrypted data

Spacing +23 added lines, -23 removed lines

@@ -48,23 +48,23 @@ 
     */
 
     private $_supportedCiphers = [
-        'aes-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aes-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aes-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aes-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aes-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aes-256-gcm' => [ 'tag' => true, 'key' => 32 ],
-        'chacha20' => [ 'tag' => false, 'key' => 32 ],
-        'chacha20-poly1305' => [ 'tag' => false, 'key' => 32 ],
-        'camellia-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'camellia-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'camellia-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aria-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aria-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aria-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aria-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-256-gcm' => [ 'tag' => true, 'key' => 32 ],
+        'aes-128-cbc' => ['tag' => false, 'key' => 16],
+        'aes-128-gcm' => ['tag' => true, 'key' => 16],
+        'aes-192-cbc' => ['tag' => false, 'key' => 24],
+        'aes-192-gcm' => ['tag' => true, 'key' => 24],
+        'aes-256-cbc' => ['tag' => false, 'key' => 32],
+        'aes-256-gcm' => ['tag' => true, 'key' => 32],
+        'chacha20' => ['tag' => false, 'key' => 32],
+        'chacha20-poly1305' => ['tag' => false, 'key' => 32],
+        'camellia-128-cbc' => ['tag' => false, 'key' => 16],
+        'camellia-192-cbc' => ['tag' => false, 'key' => 24],
+        'camellia-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-128-cbc' => ['tag' => false, 'key' => 16],
+        'aria-128-gcm' => ['tag' => true, 'key' => 16],
+        'aria-192-cbc' => ['tag' => false, 'key' => 24],
+        'aria-192-gcm' => ['tag' => true, 'key' => 24],
+        'aria-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-256-gcm' => ['tag' => true, 'key' => 32],
     ];
 
     /**
@@ -137,12 +137,12 @@ 
         // A longer key is not a problem, but could indicate a configuration error
         $key_length = $this->_supportedCiphers[$this->_cipher]['key'];
         if (strlen($key) != $key_length) {
-            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got " . strlen($key) . " bytes");
+            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got ".strlen($key)." bytes");
         }
 
         // openssl_encrypt returns the ciphertext as a base64 encoded string, so we don't need to encode it again
         // The tag is returned as a binary string, but only if the cipher requires a tag
-        $tag='';
+        $tag = '';
         if ($this->_supportedCiphers[$this->_cipher]['tag']) {
             $encrypted = openssl_encrypt($data, $this->_cipher, $key, 0, $iv, $tag, '', 16);
         } else {
@@ -154,7 +154,7 @@ 
         $tag = $this->_supportedCiphers[$this->_cipher]['tag'] ? $tag : '';
         // Return the encoded ciphertext, including the IV, tag and cipher
         // <cipher>:<key_id>:iv<>:<tag>:<ciphertext>
-        $encoded = $this->_cipher . ":" . $this->_key_id . ":" . base64_encode($iv) . ":" . base64_encode($tag) . ":" . $encrypted;
+        $encoded = $this->_cipher.":".$this->_key_id.":".base64_encode($iv).":".base64_encode($tag).":".$encrypted;
 
         return $encoded;
     }
@@ -193,19 +193,19 @@ 
         }
 
         // IV
-        $iv = base64_decode($split_data[2],true);
+        $iv = base64_decode($split_data[2], true);
         if ($iv === false) {
             throw new RuntimeException("Error decoding IV");
         }
 
         // Tag
-        $tag = base64_decode($split_data[3],true);
+        $tag = base64_decode($split_data[3], true);
         if ($tag === false) {
             throw new RuntimeException("Error decoding tag");
         }
         $ciphertext = $split_data[4];
 
-        $plaintext=openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
+        $plaintext = openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
         if ($plaintext === false) {
             throw new RuntimeException("Error decrypting data");
         }

library/tiqr/Tiqr/UserSecretStorage.php

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      *         ),
      *     )
      * );
- *
+     *
      *
      * @return Tiqr_UserSecretStorage_Interface
      * @throws RuntimeException If an unknown type is requested.