sop / jwx

lib/JWX/JWE/KeyAlgorithm/A128KWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class A128KWAlgorithm extends AESKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _kekSize()
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _kekSize()
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _AESKWAlgo()
-    {
-        return new AESKW128();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _AESKWAlgo()
+	{
+		return new AESKW128();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_A128KW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_A128KW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/PBES2Algorithm.php

Indentation +196 added lines, -196 removed lines

@@ -19,200 +19,200 @@
  */
 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();
-    
-    /**
-     * Get derived key length.
-     *
-     * @return int
-     */
-    abstract protected function _keyLength();
-    
-    /**
-     * Get key wrapping algoritym.
-     *
-     * @return \AESKW\AESKeyWrapAlgorithm
-     */
-    abstract protected function _kwAlgo();
-    
-    /**
-     * Constructor.
-     *
-     * @param string $password Password
-     * @param string $salt_input Salt input
-     * @param int $count Iteration count
-     */
-    public function __construct($password, $salt_input, $count)
-    {
-        $this->_password = $password;
-        $this->_saltInput = $salt_input;
-        $this->_count = $count;
-    }
-    
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return PBES2Algorithm
-     */
-    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($password, $count = 64000, $salt_bytes = 8)
-    {
-        $salt_input = openssl_random_pseudo_bytes($salt_bytes);
-        return new static($password, $salt_input, $count);
-    }
-    
-    /**
-     * Get salt input.
-     *
-     * @return string
-     */
-    public function saltInput()
-    {
-        return $this->_saltInput;
-    }
-    
-    /**
-     * Get computed salt.
-     *
-     * @return string
-     */
-    public function salt()
-    {
-        return PBES2SaltInputParameter::fromString($this->_saltInput)->salt(
-            AlgorithmParameter::fromAlgorithm($this));
-    }
-    
-    /**
-     * Get iteration count.
-     *
-     * @return int
-     */
-    public function iterationCount()
-    {
-        return $this->_count;
-    }
-    
-    /**
-     * Get derived key.
-     *
-     * @return string
-     */
-    protected function _derivedKey()
-    {
-        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($key, Header &$header)
-    {
-        return $this->_kwAlgo()->wrap($key, $this->_derivedKey());
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _decryptKey($ciphertext, Header $header)
-    {
-        return $this->_kwAlgo()->unwrap($ciphertext, $this->_derivedKey());
-    }
-    
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters()
-    {
-        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();
+    
+	/**
+	 * Get derived key length.
+	 *
+	 * @return int
+	 */
+	abstract protected function _keyLength();
+    
+	/**
+	 * Get key wrapping algoritym.
+	 *
+	 * @return \AESKW\AESKeyWrapAlgorithm
+	 */
+	abstract protected function _kwAlgo();
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param string $password Password
+	 * @param string $salt_input Salt input
+	 * @param int $count Iteration count
+	 */
+	public function __construct($password, $salt_input, $count)
+	{
+		$this->_password = $password;
+		$this->_saltInput = $salt_input;
+		$this->_count = $count;
+	}
+    
+	/**
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @throws \UnexpectedValueException
+	 * @return PBES2Algorithm
+	 */
+	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($password, $count = 64000, $salt_bytes = 8)
+	{
+		$salt_input = openssl_random_pseudo_bytes($salt_bytes);
+		return new static($password, $salt_input, $count);
+	}
+    
+	/**
+	 * Get salt input.
+	 *
+	 * @return string
+	 */
+	public function saltInput()
+	{
+		return $this->_saltInput;
+	}
+    
+	/**
+	 * Get computed salt.
+	 *
+	 * @return string
+	 */
+	public function salt()
+	{
+		return PBES2SaltInputParameter::fromString($this->_saltInput)->salt(
+			AlgorithmParameter::fromAlgorithm($this));
+	}
+    
+	/**
+	 * Get iteration count.
+	 *
+	 * @return int
+	 */
+	public function iterationCount()
+	{
+		return $this->_count;
+	}
+    
+	/**
+	 * Get derived key.
+	 *
+	 * @return string
+	 */
+	protected function _derivedKey()
+	{
+		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($key, Header &$header)
+	{
+		return $this->_kwAlgo()->wrap($key, $this->_derivedKey());
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _decryptKey($ciphertext, Header $header)
+	{
+		return $this->_kwAlgo()->unwrap($ciphertext, $this->_derivedKey());
+	}
+    
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters()
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this),
+				PBES2SaltInputParameter::fromString($this->_saltInput),
+				new PBES2CountParameter($this->_count)));
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWE/KeyAlgorithm/RSAESPKCS1Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -11,21 +11,21 @@
  */
 class RSAESPKCS1Algorithm extends RSAESKeyAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _paddingScheme()
-    {
-        return OPENSSL_PKCS1_PADDING;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _paddingScheme()
+	{
+		return OPENSSL_PKCS1_PADDING;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_RSA1_5;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_RSA1_5;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/RSAESKeyAlgorithm.php

Indentation +187 added lines, -187 removed lines

@@ -19,206 +19,206 @@
  */
 abstract class RSAESKeyAlgorithm extends KeyManagementAlgorithm
 {
-    use RandomCEK;
+	use RandomCEK;
     
-    /**
-     * Public key.
-     *
-     * @var RSAPublicKeyJWK $_publicKey
-     */
-    protected $_publicKey;
+	/**
+	 * Public key.
+	 *
+	 * @var RSAPublicKeyJWK $_publicKey
+	 */
+	protected $_publicKey;
     
-    /**
-     * Private key.
-     *
-     * @var RSAPrivateKeyJWK|null $_privateKey
-     */
-    protected $_privateKey;
+	/**
+	 * Private key.
+	 *
+	 * @var RSAPrivateKeyJWK|null $_privateKey
+	 */
+	protected $_privateKey;
     
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_RSA1_5 => RSAESPKCS1Algorithm::class,
-        JWA::ALGO_RSA_OAEP => RSAESOAEPAlgorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_RSA1_5 => RSAESPKCS1Algorithm::class,
+		JWA::ALGO_RSA_OAEP => RSAESOAEPAlgorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Get the padding scheme.
-     *
-     * @return int
-     */
-    abstract protected function _paddingScheme();
+	/**
+	 * Get the padding scheme.
+	 *
+	 * @return int
+	 */
+	abstract protected function _paddingScheme();
     
-    /**
-     * Constructor.
-     *
-     * Use <code>fromPublicKey</code> or <code>fromPrivateKey</code> instead!
-     *
-     * @param RSAPublicKeyJWK $pub_key RSA public key
-     * @param RSAPrivateKeyJWK $priv_key Optional RSA private key
-     */
-    protected function __construct(RSAPublicKeyJWK $pub_key,
-        RSAPrivateKeyJWK $priv_key = null)
-    {
-        $this->_publicKey = $pub_key;
-        $this->_privateKey = $priv_key;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * Use <code>fromPublicKey</code> or <code>fromPrivateKey</code> instead!
+	 *
+	 * @param RSAPublicKeyJWK $pub_key RSA public key
+	 * @param RSAPrivateKeyJWK $priv_key Optional RSA private key
+	 */
+	protected function __construct(RSAPublicKeyJWK $pub_key,
+		RSAPrivateKeyJWK $priv_key = null)
+	{
+		$this->_publicKey = $pub_key;
+		$this->_privateKey = $priv_key;
+	}
     
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return RSAESKeyAlgorithm
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $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];
-        if ($jwk->has(...RSAPrivateKeyJWK::MANAGED_PARAMS)) {
-            return $cls::fromPrivateKey(RSAPrivateKeyJWK::fromJWK($jwk));
-        }
-        return $cls::fromPublicKey(RSAPublicKeyJWK::fromJWK($jwk));
-    }
+	/**
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @throws \UnexpectedValueException
+	 * @return RSAESKeyAlgorithm
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$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];
+		if ($jwk->has(...RSAPrivateKeyJWK::MANAGED_PARAMS)) {
+			return $cls::fromPrivateKey(RSAPrivateKeyJWK::fromJWK($jwk));
+		}
+		return $cls::fromPublicKey(RSAPublicKeyJWK::fromJWK($jwk));
+	}
     
-    /**
-     * Initialize from a public key.
-     *
-     * @param RSAPublicKeyJWK $jwk
-     * @return self
-     */
-    public static function fromPublicKey(RSAPublicKeyJWK $jwk)
-    {
-        return new static($jwk);
-    }
+	/**
+	 * Initialize from a public key.
+	 *
+	 * @param RSAPublicKeyJWK $jwk
+	 * @return self
+	 */
+	public static function fromPublicKey(RSAPublicKeyJWK $jwk)
+	{
+		return new static($jwk);
+	}
     
-    /**
-     * Initialize from a private key.
-     *
-     * @param RSAPrivateKeyJWK $jwk
-     * @return self
-     */
-    public static function fromPrivateKey(RSAPrivateKeyJWK $jwk)
-    {
-        return new static($jwk->publicKey(), $jwk);
-    }
+	/**
+	 * Initialize from a private key.
+	 *
+	 * @param RSAPrivateKeyJWK $jwk
+	 * @return self
+	 */
+	public static function fromPrivateKey(RSAPrivateKeyJWK $jwk)
+	{
+		return new static($jwk->publicKey(), $jwk);
+	}
     
-    /**
-     * Get the public key.
-     *
-     * @return RSAPublicKeyJWK
-     */
-    public function publicKey()
-    {
-        return $this->_publicKey;
-    }
+	/**
+	 * Get the public key.
+	 *
+	 * @return RSAPublicKeyJWK
+	 */
+	public function publicKey()
+	{
+		return $this->_publicKey;
+	}
     
-    /**
-     * Check whether the private key is present.
-     *
-     * @return bool
-     */
-    public function hasPrivateKey()
-    {
-        return isset($this->_privateKey);
-    }
+	/**
+	 * Check whether the private key is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPrivateKey()
+	{
+		return isset($this->_privateKey);
+	}
     
-    /**
-     * Get the private key.
-     *
-     * @throws \LogicException
-     * @return RSAPrivateKeyJWK
-     */
-    public function privateKey()
-    {
-        if (!$this->hasPrivateKey()) {
-            throw new \LogicException("Private key not set.");
-        }
-        return $this->_privateKey;
-    }
+	/**
+	 * Get the private key.
+	 *
+	 * @throws \LogicException
+	 * @return RSAPrivateKeyJWK
+	 */
+	public function privateKey()
+	{
+		if (!$this->hasPrivateKey()) {
+			throw new \LogicException("Private key not set.");
+		}
+		return $this->_privateKey;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encryptKey($key, Header &$header)
-    {
-        $pubkey = openssl_pkey_get_public(
-            $this->publicKey()
-                ->toPEM()
-                ->string());
-        if (false === $pubkey) {
-            throw new \RuntimeException(
-                "openssl_pkey_get_public() failed: " .
-                     $this->_getLastOpenSSLError());
-        }
-        $result = openssl_public_encrypt($key, $crypted, $pubkey,
-            $this->_paddingScheme());
-        if (!$result) {
-            throw new \RuntimeException(
-                "openssl_public_encrypt() failed: " .
-                     $this->_getLastOpenSSLError());
-        }
-        return $crypted;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encryptKey($key, Header &$header)
+	{
+		$pubkey = openssl_pkey_get_public(
+			$this->publicKey()
+				->toPEM()
+				->string());
+		if (false === $pubkey) {
+			throw new \RuntimeException(
+				"openssl_pkey_get_public() failed: " .
+					 $this->_getLastOpenSSLError());
+		}
+		$result = openssl_public_encrypt($key, $crypted, $pubkey,
+			$this->_paddingScheme());
+		if (!$result) {
+			throw new \RuntimeException(
+				"openssl_public_encrypt() failed: " .
+					 $this->_getLastOpenSSLError());
+		}
+		return $crypted;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _decryptKey($ciphertext, Header $header)
-    {
-        $privkey = openssl_pkey_get_private(
-            $this->privateKey()
-                ->toPEM()
-                ->string());
-        if (!$privkey) {
-            throw new \RuntimeException(
-                "openssl_pkey_get_private() failed: " .
-                     $this->_getLastOpenSSLError());
-        }
-        $result = openssl_private_decrypt($ciphertext, $cek, $privkey,
-            $this->_paddingScheme());
-        if (!$result) {
-            throw new \RuntimeException(
-                "openssl_private_decrypt() failed: " .
-                     $this->_getLastOpenSSLError());
-        }
-        return $cek;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _decryptKey($ciphertext, Header $header)
+	{
+		$privkey = openssl_pkey_get_private(
+			$this->privateKey()
+				->toPEM()
+				->string());
+		if (!$privkey) {
+			throw new \RuntimeException(
+				"openssl_pkey_get_private() failed: " .
+					 $this->_getLastOpenSSLError());
+		}
+		$result = openssl_private_decrypt($ciphertext, $cek, $privkey,
+			$this->_paddingScheme());
+		if (!$result) {
+			throw new \RuntimeException(
+				"openssl_private_decrypt() failed: " .
+					 $this->_getLastOpenSSLError());
+		}
+		return $cek;
+	}
     
-    /**
-     * Get last OpenSSL error message.
-     *
-     * @return string|null
-     */
-    protected function _getLastOpenSSLError()
-    {
-        $msg = null;
-        while (false !== ($err = openssl_error_string())) {
-            $msg = $err;
-        }
-        return $msg;
-    }
+	/**
+	 * Get last OpenSSL error message.
+	 *
+	 * @return string|null
+	 */
+	protected function _getLastOpenSSLError()
+	{
+		$msg = null;
+		while (false !== ($err = openssl_error_string())) {
+			$msg = $err;
+		}
+		return $msg;
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters()
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters()
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
      *
      * {@inheritdoc}
      */
-    protected function _encryptKey($key, Header &$header)
+    protected function _encryptKey($key, Header&$header)
     {
         $pubkey = openssl_pkey_get_public(
             $this->publicKey()

lib/JWX/JWE/KeyAlgorithm/A192KWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class A192KWAlgorithm extends AESKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _kekSize()
-    {
-        return 24;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _kekSize()
+	{
+		return 24;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _AESKWAlgo()
-    {
-        return new AESKW192();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _AESKWAlgo()
+	{
+		return new AESKW192();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_A192KW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_A192KW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/AESGCMKWAlgorithm.php

Indentation +153 added lines, -153 removed lines

@@ -20,171 +20,171 @@
  */
 abstract class AESGCMKWAlgorithm extends KeyManagementAlgorithm
 {
-    use RandomCEK;
+	use RandomCEK;
     
-    /**
-     * Key encryption key.
-     *
-     * @var string $_kek
-     */
-    protected $_kek;
+	/**
+	 * Key encryption key.
+	 *
+	 * @var string $_kek
+	 */
+	protected $_kek;
     
-    /**
-     * Initialization vector.
-     *
-     * @var string $_iv
-     */
-    protected $_iv;
+	/**
+	 * Initialization vector.
+	 *
+	 * @var string $_iv
+	 */
+	protected $_iv;
     
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_A128GCMKW => A128GCMKWAlgorithm::class, 
-        JWA::ALGO_A192GCMKW => A192GCMKWAlgorithm::class, 
-        JWA::ALGO_A256GCMKW => A256GCMKWAlgorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_A128GCMKW => A128GCMKWAlgorithm::class, 
+		JWA::ALGO_A192GCMKW => A192GCMKWAlgorithm::class, 
+		JWA::ALGO_A256GCMKW => A256GCMKWAlgorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Required IV size in bytes.
-     *
-     * @var int
-     */
-    const IV_SIZE = 12;
+	/**
+	 * Required IV size in bytes.
+	 *
+	 * @var int
+	 */
+	const IV_SIZE = 12;
     
-    /**
-     * Authentication tag size in bytes.
-     *
-     * @var int
-     */
-    const AUTH_TAG_SIZE = 16;
+	/**
+	 * Authentication tag size in bytes.
+	 *
+	 * @var int
+	 */
+	const AUTH_TAG_SIZE = 16;
     
-    /**
-     * Get GCM Cipher instance.
-     *
-     * @return \GCM\Cipher\Cipher
-     */
-    abstract protected function _getGCMCipher();
+	/**
+	 * Get GCM Cipher instance.
+	 *
+	 * @return \GCM\Cipher\Cipher
+	 */
+	abstract protected function _getGCMCipher();
     
-    /**
-     * Get the required key size.
-     *
-     * @return int
-     */
-    abstract protected function _keySize();
+	/**
+	 * Get the required key size.
+	 *
+	 * @return int
+	 */
+	abstract protected function _keySize();
     
-    /**
-     * Get GCM instance.
-     *
-     * @return GCM
-     */
-    final protected function _getGCM()
-    {
-        return new GCM($this->_getGCMCipher(), self::AUTH_TAG_SIZE);
-    }
+	/**
+	 * Get GCM instance.
+	 *
+	 * @return GCM
+	 */
+	final protected function _getGCM()
+	{
+		return new GCM($this->_getGCMCipher(), self::AUTH_TAG_SIZE);
+	}
     
-    /**
-     * Constructor.
-     *
-     * @param string $kek Key encryption key
-     * @param string $iv Initialization vector
-     */
-    public function __construct($kek, $iv)
-    {
-        if (strlen($kek) != $this->_keySize()) {
-            throw new \LengthException("Invalid key size.");
-        }
-        if (strlen($iv) != self::IV_SIZE) {
-            throw new \LengthException("Initialization vector must be 96 bits.");
-        }
-        $this->_kek = $kek;
-        $this->_iv = $iv;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $kek Key encryption key
+	 * @param string $iv Initialization vector
+	 */
+	public function __construct($kek, $iv)
+	{
+		if (strlen($kek) != $this->_keySize()) {
+			throw new \LengthException("Invalid key size.");
+		}
+		if (strlen($iv) != self::IV_SIZE) {
+			throw new \LengthException("Initialization vector must be 96 bits.");
+		}
+		$this->_kek = $kek;
+		$this->_iv = $iv;
+	}
     
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return AESGCMKWAlgorithm
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        if (!$header->hasInitializationVector()) {
-            throw new \UnexpectedValueException("No initialization vector.");
-        }
-        $iv = $header->initializationVector()->initializationVector();
-        $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(), $iv);
-    }
+	/**
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @throws \UnexpectedValueException
+	 * @return AESGCMKWAlgorithm
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		if (!$header->hasInitializationVector()) {
+			throw new \UnexpectedValueException("No initialization vector.");
+		}
+		$iv = $header->initializationVector()->initializationVector();
+		$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(), $iv);
+	}
     
-    /**
-     * Initialize from key encryption key with random IV.
-     *
-     * Key size must match the underlying cipher.
-     *
-     * @param string $key Key encryption key
-     * @return self
-     */
-    public static function fromKey($key)
-    {
-        $iv = openssl_random_pseudo_bytes(self::IV_SIZE);
-        return new static($key, $iv);
-    }
+	/**
+	 * Initialize from key encryption key with random IV.
+	 *
+	 * Key size must match the underlying cipher.
+	 *
+	 * @param string $key Key encryption key
+	 * @return self
+	 */
+	public static function fromKey($key)
+	{
+		$iv = openssl_random_pseudo_bytes(self::IV_SIZE);
+		return new static($key, $iv);
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::_encryptKey()
-     * @return string
-     */
-    protected function _encryptKey($key, Header &$header)
-    {
-        list($ciphertext, $auth_tag) = $this->_getGCM()->encrypt($key, "",
-            $this->_kek, $this->_iv);
-        // insert authentication tag to the header
-        $header = $header->withParameters(
-            AuthenticationTagParameter::fromString($auth_tag));
-        return $ciphertext;
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::_encryptKey()
+	 * @return string
+	 */
+	protected function _encryptKey($key, Header &$header)
+	{
+		list($ciphertext, $auth_tag) = $this->_getGCM()->encrypt($key, "",
+			$this->_kek, $this->_iv);
+		// insert authentication tag to the header
+		$header = $header->withParameters(
+			AuthenticationTagParameter::fromString($auth_tag));
+		return $ciphertext;
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::_decryptKey()
-     * @throws \RuntimeException For generic errors
-     * @return string
-     */
-    protected function _decryptKey($ciphertext, Header $header)
-    {
-        if (!$header->hasAuthenticationTag()) {
-            throw new \RuntimeException(
-                "Header doesn't contain authentication tag.");
-        }
-        $auth_tag = $header->authenticationTag()->authenticationTag();
-        $cek = $this->_getGCM()->decrypt($ciphertext, $auth_tag, "", $this->_kek,
-            $this->_iv);
-        return $cek;
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::_decryptKey()
+	 * @throws \RuntimeException For generic errors
+	 * @return string
+	 */
+	protected function _decryptKey($ciphertext, Header $header)
+	{
+		if (!$header->hasAuthenticationTag()) {
+			throw new \RuntimeException(
+				"Header doesn't contain authentication tag.");
+		}
+		$auth_tag = $header->authenticationTag()->authenticationTag();
+		$cek = $this->_getGCM()->decrypt($ciphertext, $auth_tag, "", $this->_kek,
+			$this->_iv);
+		return $cek;
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters()
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this),
-                InitializationVectorParameter::fromString($this->_iv)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\KeyManagementAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters()
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this),
+				InitializationVectorParameter::fromString($this->_iv)));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
      * @see \JWX\JWE\KeyManagementAlgorithm::_encryptKey()
      * @return string
      */
-    protected function _encryptKey($key, Header &$header)
+    protected function _encryptKey($key, Header&$header)
     {
         list($ciphertext, $auth_tag) = $this->_getGCM()->encrypt($key, "",
             $this->_kek, $this->_iv);

lib/JWX/JWE/KeyAlgorithm/A256GCMKWAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class A256GCMKWAlgorithm extends AESGCMKWAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _getGCMCipher()
-    {
-        return new AES256Cipher();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _getGCMCipher()
+	{
+		return new AES256Cipher();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _keySize()
-    {
-        return 32;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _keySize()
+	{
+		return 32;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_A256GCMKW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_A256GCMKW;
+	}
 }

lib/JWX/JWE/KeyAlgorithm/PBES2HS256A128KWAlgorithm.php

Indentation +32 added lines, -32 removed lines

@@ -12,39 +12,39 @@
  */
 class PBES2HS256A128KWAlgorithm extends PBES2Algorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo()
-    {
-        return "sha256";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo()
+	{
+		return "sha256";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _keyLength()
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _keyLength()
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _kwAlgo()
-    {
-        return new AESKW128();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _kwAlgo()
+	{
+		return new AESKW128();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_PBES2_HS256_A128KW;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_PBES2_HS256_A128KW;
+	}
 }

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

Indentation +15 added lines, -15 removed lines

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