sop / jwx

lib/JWX/JWE/KeyAlgorithm/A128GCMKWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -15,30 +15,30 @@
  */
 class A128GCMKWAlgorithm extends AESGCMKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _getGCMCipher(): Cipher
-    {
-        return new AES128Cipher();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _getGCMCipher(): Cipher
+	{
+		return new AES128Cipher();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _keySize(): int
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _keySize(): int
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_A128GCMKW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_A128GCMKW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/A192GCMKWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -15,30 +15,30 @@
  */
 class A192GCMKWAlgorithm extends AESGCMKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _getGCMCipher(): Cipher
-    {
-        return new AES192Cipher();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _getGCMCipher(): Cipher
+	{
+		return new AES192Cipher();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _keySize(): int
-    {
-        return 24;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _keySize(): int
+	{
+		return 24;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_A192GCMKW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_A192GCMKW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/PBES2HS384A192KWAlgorithm.php

Indentation +32 added lines, -32 removed lines

@@ -15,39 +15,39 @@
  */
 class PBES2HS384A192KWAlgorithm extends PBES2Algorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo(): string
-    {
-        return "sha384";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo(): string
+	{
+		return "sha384";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _keyLength(): int
-    {
-        return 24;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _keyLength(): int
+	{
+		return 24;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _kwAlgo(): AESKeyWrapAlgorithm
-    {
-        return new AESKW192();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _kwAlgo(): AESKeyWrapAlgorithm
+	{
+		return new AESKW192();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_PBES2_HS384_A192KW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_PBES2_HS384_A192KW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/DirectCEKAlgorithm.php

Indentation +92 added lines, -92 removed lines

@@ -18,104 +18,104 @@
  */
 class DirectCEKAlgorithm extends KeyManagementAlgorithm
 {
-    /**
-     * Content encryption key.
-     *
-     * @var string $_cek
-     */
-    protected $_cek;
+	/**
+	 * Content encryption key.
+	 *
+	 * @var string $_cek
+	 */
+	protected $_cek;
     
-    /**
-     * Constructor.
-     *
-     * @param string $cek Content encryption key
-     */
-    public function __construct(string $cek)
-    {
-        $this->_cek = $cek;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $cek Content encryption key
+	 */
+	public function __construct(string $cek)
+	{
+		$this->_cek = $cek;
+	}
     
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        $alg = JWA::deriveAlgorithmName($header);
-        if ($alg != JWA::ALGO_DIR) {
-            throw new \UnexpectedValueException("Invalid algorithm '$alg'.");
-        }
-        return new self($jwk->key());
-    }
+	/**
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		$alg = JWA::deriveAlgorithmName($header);
+		if ($alg != JWA::ALGO_DIR) {
+			throw new \UnexpectedValueException("Invalid algorithm '$alg'.");
+		}
+		return new self($jwk->key());
+	}
     
-    /**
-     * Get content encryption key.
-     *
-     * @return string
-     */
-    public function cek(): string
-    {
-        return $this->_cek;
-    }
+	/**
+	 * Get content encryption key.
+	 *
+	 * @return string
+	 */
+	public function cek(): string
+	{
+		return $this->_cek;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encryptKey(string $key, Header &$header): string
-    {
-        if ($key != $this->_cek) {
-            throw new \LogicException("Content encryption key doesn't match.");
-        }
-        return "";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encryptKey(string $key, Header &$header): string
+	{
+		if ($key != $this->_cek) {
+			throw new \LogicException("Content encryption key doesn't match.");
+		}
+		return "";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _decryptKey(string $ciphertext, Header $header): string
-    {
-        if ($ciphertext !== "") {
-            throw new \UnexpectedValueException(
-                "Encrypted key must be an empty octet sequence.");
-        }
-        return $this->_cek;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _decryptKey(string $ciphertext, Header $header): string
+	{
+		if ($ciphertext !== "") {
+			throw new \UnexpectedValueException(
+				"Encrypted key must be an empty octet sequence.");
+		}
+		return $this->_cek;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function cekForEncryption(int $length): string
-    {
-        if (strlen($this->_cek) != $length) {
-            throw new \UnexpectedValueException("Invalid key length.");
-        }
-        return $this->_cek;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function cekForEncryption(int $length): string
+	{
+		if (strlen($this->_cek) != $length) {
+			throw new \UnexpectedValueException("Invalid key length.");
+		}
+		return $this->_cek;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_DIR;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_DIR;
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      *
      * {@inheritdoc}
      */
-    protected function _encryptKey(string $key, Header &$header): string
+    protected function _encryptKey(string $key, Header&$header): string
     {
         if ($key != $this->_cek) {
             throw new \LogicException("Content encryption key doesn't match.");

lib/JWX/JWE/KeyAlgorithm/A256KWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -15,30 +15,30 @@
  */
 class A256KWAlgorithm extends AESKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _kekSize(): int
-    {
-        return 32;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _kekSize(): int
+	{
+		return 32;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _AESKWAlgo(): AESKeyWrapAlgorithm
-    {
-        return new AESKW256();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _AESKWAlgo(): AESKeyWrapAlgorithm
+	{
+		return new AESKW256();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_A256KW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_A256KW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/PBES2Algorithm.php

Indentation +197 added lines, -197 removed lines

@@ -22,201 +22,201 @@
  */
 abstract class PBES2Algorithm extends KeyManagementAlgorithm
 {
-    use RandomCEK;
-    
-    /**
-     * Password.
-     *
-     * @var string $_password
-     */
-    protected $_password;
-    
-    /**
-     * Salt input.
-     *
-     * @var string $_salt
-     */
-    protected $_saltInput;
-    
-    /**
-     * Iteration count.
-     *
-     * @var int $_count
-     */
-    protected $_count;
-    
-    /**
-     * Derived key.
-     *
-     * @var string
-     */
-    private $_derivedKey;
-    
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_PBES2_HS256_A128KW => PBES2HS256A128KWAlgorithm::class, 
-        JWA::ALGO_PBES2_HS384_A192KW => PBES2HS384A192KWAlgorithm::class, 
-        JWA::ALGO_PBES2_HS512_A256KW => PBES2HS512A256KWAlgorithm::class
-        /* @formatter:on */
-    );
-    
-    /**
-     * Get hash algorithm for hash_pbkdf2.
-     *
-     * @return string
-     */
-    abstract protected function _hashAlgo(): string;
-    
-    /**
-     * Get derived key length.
-     *
-     * @return int
-     */
-    abstract protected function _keyLength(): int;
-    
-    /**
-     * Get key wrapping algoritym.
-     *
-     * @return AESKeyWrapAlgorithm
-     */
-    abstract protected function _kwAlgo(): AESKeyWrapAlgorithm;
-    
-    /**
-     * Constructor.
-     *
-     * @param string $password Password
-     * @param string $salt_input Salt input
-     * @param int $count Iteration count
-     */
-    public function __construct(string $password, string $salt_input, int $count)
-    {
-        $this->_password = $password;
-        $this->_saltInput = $salt_input;
-        $this->_count = $count;
-    }
-    
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        if (!$header->hasPBES2SaltInput()) {
-            throw new \UnexpectedValueException("No salt input.");
-        }
-        $salt_input = $header->PBES2SaltInput()->saltInput();
-        if (!$header->hasPBES2Count()) {
-            throw new \UnexpectedValueException("No iteration count.");
-        }
-        $count = $header->PBES2Count()->value();
-        $alg = JWA::deriveAlgorithmName($header, $jwk);
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException("Unsupported algorithm '$alg'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$alg];
-        return new $cls($jwk->key(), $salt_input, $count);
-    }
-    
-    /**
-     * Initialize from a password with random salt and default iteration count.
-     *
-     * @param string $password Password
-     * @param int $count Optional user defined iteration count
-     * @param int $salt_bytes Optional user defined salt length
-     * @return self
-     */
-    public static function fromPassword(string $password, int $count = 64000,
-        int $salt_bytes = 8): self
-    {
-        $salt_input = openssl_random_pseudo_bytes($salt_bytes);
-        return new static($password, $salt_input, $count);
-    }
-    
-    /**
-     * Get salt input.
-     *
-     * @return string
-     */
-    public function saltInput(): string
-    {
-        return $this->_saltInput;
-    }
-    
-    /**
-     * Get computed salt.
-     *
-     * @return string
-     */
-    public function salt(): string
-    {
-        return PBES2SaltInputParameter::fromString($this->_saltInput)->salt(
-            AlgorithmParameter::fromAlgorithm($this));
-    }
-    
-    /**
-     * Get iteration count.
-     *
-     * @return int
-     */
-    public function iterationCount(): int
-    {
-        return $this->_count;
-    }
-    
-    /**
-     * Get derived key.
-     *
-     * @return string
-     */
-    protected function _derivedKey(): string
-    {
-        if (!isset($this->_derivedKey)) {
-            $this->_derivedKey = hash_pbkdf2($this->_hashAlgo(),
-                $this->_password, $this->salt(), $this->_count,
-                $this->_keyLength(), true);
-        }
-        return $this->_derivedKey;
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encryptKey(string $key, Header &$header): string
-    {
-        return $this->_kwAlgo()->wrap($key, $this->_derivedKey());
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _decryptKey(string $ciphertext, Header $header): string
-    {
-        return $this->_kwAlgo()->unwrap($ciphertext, $this->_derivedKey());
-    }
-    
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this),
-                PBES2SaltInputParameter::fromString($this->_saltInput),
-                new PBES2CountParameter($this->_count)));
-    }
+	use RandomCEK;
+    
+	/**
+	 * Password.
+	 *
+	 * @var string $_password
+	 */
+	protected $_password;
+    
+	/**
+	 * Salt input.
+	 *
+	 * @var string $_salt
+	 */
+	protected $_saltInput;
+    
+	/**
+	 * Iteration count.
+	 *
+	 * @var int $_count
+	 */
+	protected $_count;
+    
+	/**
+	 * Derived key.
+	 *
+	 * @var string
+	 */
+	private $_derivedKey;
+    
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_PBES2_HS256_A128KW => PBES2HS256A128KWAlgorithm::class, 
+		JWA::ALGO_PBES2_HS384_A192KW => PBES2HS384A192KWAlgorithm::class, 
+		JWA::ALGO_PBES2_HS512_A256KW => PBES2HS512A256KWAlgorithm::class
+		/* @formatter:on */
+	);
+    
+	/**
+	 * Get hash algorithm for hash_pbkdf2.
+	 *
+	 * @return string
+	 */
+	abstract protected function _hashAlgo(): string;
+    
+	/**
+	 * Get derived key length.
+	 *
+	 * @return int
+	 */
+	abstract protected function _keyLength(): int;
+    
+	/**
+	 * Get key wrapping algoritym.
+	 *
+	 * @return AESKeyWrapAlgorithm
+	 */
+	abstract protected function _kwAlgo(): AESKeyWrapAlgorithm;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param string $password Password
+	 * @param string $salt_input Salt input
+	 * @param int $count Iteration count
+	 */
+	public function __construct(string $password, string $salt_input, int $count)
+	{
+		$this->_password = $password;
+		$this->_saltInput = $salt_input;
+		$this->_count = $count;
+	}
+    
+	/**
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		if (!$header->hasPBES2SaltInput()) {
+			throw new \UnexpectedValueException("No salt input.");
+		}
+		$salt_input = $header->PBES2SaltInput()->saltInput();
+		if (!$header->hasPBES2Count()) {
+			throw new \UnexpectedValueException("No iteration count.");
+		}
+		$count = $header->PBES2Count()->value();
+		$alg = JWA::deriveAlgorithmName($header, $jwk);
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException("Unsupported algorithm '$alg'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$alg];
+		return new $cls($jwk->key(), $salt_input, $count);
+	}
+    
+	/**
+	 * Initialize from a password with random salt and default iteration count.
+	 *
+	 * @param string $password Password
+	 * @param int $count Optional user defined iteration count
+	 * @param int $salt_bytes Optional user defined salt length
+	 * @return self
+	 */
+	public static function fromPassword(string $password, int $count = 64000,
+		int $salt_bytes = 8): self
+	{
+		$salt_input = openssl_random_pseudo_bytes($salt_bytes);
+		return new static($password, $salt_input, $count);
+	}
+    
+	/**
+	 * Get salt input.
+	 *
+	 * @return string
+	 */
+	public function saltInput(): string
+	{
+		return $this->_saltInput;
+	}
+    
+	/**
+	 * Get computed salt.
+	 *
+	 * @return string
+	 */
+	public function salt(): string
+	{
+		return PBES2SaltInputParameter::fromString($this->_saltInput)->salt(
+			AlgorithmParameter::fromAlgorithm($this));
+	}
+    
+	/**
+	 * Get iteration count.
+	 *
+	 * @return int
+	 */
+	public function iterationCount(): int
+	{
+		return $this->_count;
+	}
+    
+	/**
+	 * Get derived key.
+	 *
+	 * @return string
+	 */
+	protected function _derivedKey(): string
+	{
+		if (!isset($this->_derivedKey)) {
+			$this->_derivedKey = hash_pbkdf2($this->_hashAlgo(),
+				$this->_password, $this->salt(), $this->_count,
+				$this->_keyLength(), true);
+		}
+		return $this->_derivedKey;
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encryptKey(string $key, Header &$header): string
+	{
+		return $this->_kwAlgo()->wrap($key, $this->_derivedKey());
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _decryptKey(string $ciphertext, Header $header): string
+	{
+		return $this->_kwAlgo()->unwrap($ciphertext, $this->_derivedKey());
+	}
+    
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this),
+				PBES2SaltInputParameter::fromString($this->_saltInput),
+				new PBES2CountParameter($this->_count)));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
      *
      * {@inheritdoc}
      */
-    protected function _encryptKey(string $key, Header &$header): string
+    protected function _encryptKey(string $key, Header&$header): string
     {
         return $this->_kwAlgo()->wrap($key, $this->_derivedKey());
     }

lib/JWX/JWE/KeyAlgorithm/AESKWAlgorithm.php

Indentation +109 added lines, -109 removed lines

@@ -20,124 +20,124 @@
  */
 abstract class AESKWAlgorithm extends KeyManagementAlgorithm
 {
-    use RandomCEK;
+	use RandomCEK;
     
-    /**
-     * Key encryption key.
-     *
-     * @var string $_kek
-     */
-    protected $_kek;
+	/**
+	 * Key encryption key.
+	 *
+	 * @var string $_kek
+	 */
+	protected $_kek;
     
-    /**
-     * Key wrapping algorithm.
-     *
-     * Lazily initialized.
-     *
-     * @var AESKeyWrapAlgorithm|null $_kw
-     */
-    protected $_kw;
+	/**
+	 * Key wrapping algorithm.
+	 *
+	 * Lazily initialized.
+	 *
+	 * @var AESKeyWrapAlgorithm|null $_kw
+	 */
+	protected $_kw;
     
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_A128KW => A128KWAlgorithm::class, 
-        JWA::ALGO_A192KW => A192KWAlgorithm::class, 
-        JWA::ALGO_A256KW => A256KWAlgorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_A128KW => A128KWAlgorithm::class, 
+		JWA::ALGO_A192KW => A192KWAlgorithm::class, 
+		JWA::ALGO_A256KW => A256KWAlgorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Get the size of the key encryption key in bytes.
-     *
-     * @return int
-     */
-    abstract protected function _kekSize(): int;
+	/**
+	 * Get the size of the key encryption key in bytes.
+	 *
+	 * @return int
+	 */
+	abstract protected function _kekSize(): int;
     
-    /**
-     * Get key wrapping algorithm instance.
-     *
-     * @return AESKeyWrapAlgorithm
-     */
-    abstract protected function _AESKWAlgo(): AESKeyWrapAlgorithm;
+	/**
+	 * Get key wrapping algorithm instance.
+	 *
+	 * @return AESKeyWrapAlgorithm
+	 */
+	abstract protected function _AESKWAlgo(): AESKeyWrapAlgorithm;
     
-    /**
-     * Constructor.
-     *
-     * @param string $kek Key encryption key
-     */
-    public function __construct(string $kek)
-    {
-        if (strlen($kek) != $this->_kekSize()) {
-            throw new \LengthException(
-                "Key encryption key must be " . $this->_kekSize() . " bytes.");
-        }
-        $this->_kek = $kek;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $kek Key encryption key
+	 */
+	public function __construct(string $kek)
+	{
+		if (strlen($kek) != $this->_kekSize()) {
+			throw new \LengthException(
+				"Key encryption key must be " . $this->_kekSize() . " bytes.");
+		}
+		$this->_kek = $kek;
+	}
     
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        $alg = JWA::deriveAlgorithmName($header, $jwk);
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException("Unsupported algorithm '$alg'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$alg];
-        return new $cls($jwk->key());
-    }
+	/**
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		$alg = JWA::deriveAlgorithmName($header, $jwk);
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException("Unsupported algorithm '$alg'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$alg];
+		return new $cls($jwk->key());
+	}
     
-    /**
-     * Get key wrapping algorithm.
-     *
-     * @return AESKeyWrapAlgorithm
-     */
-    protected function _kw(): AESKeyWrapAlgorithm
-    {
-        if (!isset($this->_kw)) {
-            $this->_kw = $this->_AESKWAlgo();
-        }
-        return $this->_kw;
-    }
+	/**
+	 * Get key wrapping algorithm.
+	 *
+	 * @return AESKeyWrapAlgorithm
+	 */
+	protected function _kw(): AESKeyWrapAlgorithm
+	{
+		if (!isset($this->_kw)) {
+			$this->_kw = $this->_AESKWAlgo();
+		}
+		return $this->_kw;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encryptKey(string $key, Header &$header): string
-    {
-        return $this->_kw()->wrap($key, $this->_kek);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encryptKey(string $key, Header &$header): string
+	{
+		return $this->_kw()->wrap($key, $this->_kek);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _decryptKey(string $ciphertext, Header $header): string
-    {
-        return $this->_kw()->unwrap($ciphertext, $this->_kek);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _decryptKey(string $ciphertext, Header $header): string
+	{
+		return $this->_kw()->unwrap($ciphertext, $this->_kek);
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
      *
      * {@inheritdoc}
      */
-    protected function _encryptKey(string $key, Header &$header): string
+    protected function _encryptKey(string $key, Header&$header): string
     {
         return $this->_kw()->wrap($key, $this->_kek);
     }

lib/JWX/JWE/KeyAlgorithm/RSAESOAEPAlgorithm.php

Indentation +16 added lines, -16 removed lines

@@ -13,21 +13,21 @@
  */
 class RSAESOAEPAlgorithm extends RSAESKeyAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _paddingScheme(): int
-    {
-        return OPENSSL_PKCS1_OAEP_PADDING;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _paddingScheme(): int
+	{
+		return OPENSSL_PKCS1_OAEP_PADDING;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_RSA_OAEP;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_RSA_OAEP;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/Feature/RandomCEK.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
  */
 trait RandomCEK
 {
-    /**
-     * Generate a random content encryption key.
-     *
-     * @param int $length Key length in bytes
-     * @throws \RuntimeException
-     * @return string
-     */
-    public function cekForEncryption(int $length): string
-    {
-        $ret = openssl_random_pseudo_bytes($length);
-        if (false === $ret) {
-            throw new \RuntimeException("openssl_random_pseudo_bytes() failed.");
-        }
-        return $ret;
-    }
+	/**
+	 * Generate a random content encryption key.
+	 *
+	 * @param int $length Key length in bytes
+	 * @throws \RuntimeException
+	 * @return string
+	 */
+	public function cekForEncryption(int $length): string
+	{
+		$ret = openssl_random_pseudo_bytes($length);
+		if (false === $ret) {
+			throw new \RuntimeException("openssl_random_pseudo_bytes() failed.");
+		}
+		return $ret;
+	}
 }