sop / jwx

lib/JWX/JWS/SignatureAlgorithm.php

Indentation +63 added lines, -63 removed lines

@@ -13,73 +13,73 @@
  * Base class for algorithms usable for signing and validating JWS's.
  */
 abstract class SignatureAlgorithm implements 
-    AlgorithmParameterValue,
-    HeaderParameters
+	AlgorithmParameterValue,
+	HeaderParameters
 {
-    /**
-     * ID of the key used by the algorithm.
-     *
-     * If set, KeyID parameter shall be automatically inserted into JWS's
-     * header.
-     *
-     * @var string|null $_keyID
-     */
-    protected $_keyID;
+	/**
+	 * ID of the key used by the algorithm.
+	 *
+	 * If set, KeyID parameter shall be automatically inserted into JWS's
+	 * header.
+	 *
+	 * @var string|null $_keyID
+	 */
+	protected $_keyID;
     
-    /**
-     * Compute signature.
-     *
-     * @param string $data Data for which the signature is computed
-     * @return string
-     */
-    abstract public function computeSignature($data);
+	/**
+	 * Compute signature.
+	 *
+	 * @param string $data Data for which the signature is computed
+	 * @return string
+	 */
+	abstract public function computeSignature($data);
     
-    /**
-     * Validate signature.
-     *
-     * @param string $data Data to validate
-     * @param string $signature Signature to compare
-     * @return bool
-     */
-    abstract public function validateSignature($data, $signature);
+	/**
+	 * Validate signature.
+	 *
+	 * @param string $data Data to validate
+	 * @param string $signature Signature to compare
+	 * @return bool
+	 */
+	abstract public function validateSignature($data, $signature);
     
-    /**
-     * Initialize signature algorithm from a JWK and a header.
-     *
-     * @param JWK $jwk JSON Web Key
-     * @param Header $header Header
-     * @return SignatureAlgorithm
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $factory = new SignatureAlgorithmFactory($header);
-        return $factory->algoByKey($jwk);
-    }
+	/**
+	 * Initialize signature algorithm from a JWK and a header.
+	 *
+	 * @param JWK $jwk JSON Web Key
+	 * @param Header $header Header
+	 * @return SignatureAlgorithm
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$factory = new SignatureAlgorithmFactory($header);
+		return $factory->algoByKey($jwk);
+	}
     
-    /**
-     * Get self with key ID.
-     *
-     * @param string|null $id Key ID or null to remove
-     * @return self
-     */
-    public function withKeyID($id)
-    {
-        $obj = clone $this;
-        $obj->_keyID = $id;
-        return $obj;
-    }
+	/**
+	 * Get self with key ID.
+	 *
+	 * @param string|null $id Key ID or null to remove
+	 * @return self
+	 */
+	public function withKeyID($id)
+	{
+		$obj = clone $this;
+		$obj->_keyID = $id;
+		return $obj;
+	}
     
-    /**
-     *
-     * @see \JWX\JWT\Header\HeaderParameters::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters()
-    {
-        $params = array();
-        if (isset($this->_keyID)) {
-            $params[] = new KeyIDParameter($this->_keyID);
-        }
-        return $params;
-    }
+	/**
+	 *
+	 * @see \JWX\JWT\Header\HeaderParameters::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters()
+	{
+		$params = array();
+		if (isset($this->_keyID)) {
+			$params[] = new KeyIDParameter($this->_keyID);
+		}
+		return $params;
+	}
 }

lib/JWX/JWS/JWS.php

Indentation +253 added lines, -253 removed lines

@@ -19,277 +19,277 @@
  */
 class JWS
 {
-    /**
-     * Protected header.
-     *
-     * @var Header $_protectedHeader
-     */
-    protected $_protectedHeader;
+	/**
+	 * Protected header.
+	 *
+	 * @var Header $_protectedHeader
+	 */
+	protected $_protectedHeader;
     
-    /**
-     * Payload.
-     *
-     * @var string $_payload
-     */
-    protected $_payload;
+	/**
+	 * Payload.
+	 *
+	 * @var string $_payload
+	 */
+	protected $_payload;
     
-    /**
-     * Input value for the signature computation.
-     *
-     * @var string $_signatureInput
-     */
-    protected $_signatureInput;
+	/**
+	 * Input value for the signature computation.
+	 *
+	 * @var string $_signatureInput
+	 */
+	protected $_signatureInput;
     
-    /**
-     * Signature.
-     *
-     * @var string $_signature
-     */
-    protected $_signature;
+	/**
+	 * Signature.
+	 *
+	 * @var string $_signature
+	 */
+	protected $_signature;
     
-    /**
-     * Constructor.
-     *
-     * @param Header $protected_header JWS Protected Header
-     * @param string $payload JWS Payload
-     * @param string $signature_input Input value for the signature computation
-     * @param string $signature JWS Signature
-     */
-    protected function __construct(Header $protected_header, $payload,
-        $signature_input, $signature)
-    {
-        $this->_protectedHeader = $protected_header;
-        $this->_payload = $payload;
-        $this->_signatureInput = $signature_input;
-        $this->_signature = $signature;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Header $protected_header JWS Protected Header
+	 * @param string $payload JWS Payload
+	 * @param string $signature_input Input value for the signature computation
+	 * @param string $signature JWS Signature
+	 */
+	protected function __construct(Header $protected_header, $payload,
+		$signature_input, $signature)
+	{
+		$this->_protectedHeader = $protected_header;
+		$this->_payload = $payload;
+		$this->_signatureInput = $signature_input;
+		$this->_signature = $signature;
+	}
     
-    /**
-     * Initialize from a compact serialization.
-     *
-     * @param string $data
-     * @return self
-     */
-    public static function fromCompact($data)
-    {
-        return self::fromParts(explode(".", $data));
-    }
+	/**
+	 * Initialize from a compact serialization.
+	 *
+	 * @param string $data
+	 * @return self
+	 */
+	public static function fromCompact($data)
+	{
+		return self::fromParts(explode(".", $data));
+	}
     
-    /**
-     * Initialize from the parts of a compact serialization.
-     *
-     * @param array $parts
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromParts(array $parts)
-    {
-        if (count($parts) != 3) {
-            throw new \UnexpectedValueException(
-                "Invalid JWS compact serialization.");
-        }
-        $header = Header::fromJSON(Base64::urlDecode($parts[0]));
-        $b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
-        $payload = $b64 ? Base64::urlDecode($parts[1]) : $parts[1];
-        $signature_input = $parts[0] . "." . $parts[1];
-        $signature = Base64::urlDecode($parts[2]);
-        return new self($header, $payload, $signature_input, $signature);
-    }
+	/**
+	 * Initialize from the parts of a compact serialization.
+	 *
+	 * @param array $parts
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromParts(array $parts)
+	{
+		if (count($parts) != 3) {
+			throw new \UnexpectedValueException(
+				"Invalid JWS compact serialization.");
+		}
+		$header = Header::fromJSON(Base64::urlDecode($parts[0]));
+		$b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
+		$payload = $b64 ? Base64::urlDecode($parts[1]) : $parts[1];
+		$signature_input = $parts[0] . "." . $parts[1];
+		$signature = Base64::urlDecode($parts[2]);
+		return new self($header, $payload, $signature_input, $signature);
+	}
     
-    /**
-     * Initialize by signing the payload with given algorithm.
-     *
-     * @param string $payload JWS Payload
-     * @param SignatureAlgorithm $algo Signature algorithm
-     * @param Header|null $header Desired header. Algorithm specific
-     *        parameters are added automatically.
-     * @throws \RuntimeException If signature computation fails
-     * @return self
-     */
-    public static function sign($payload, SignatureAlgorithm $algo,
-        Header $header = null)
-    {
-        if (!isset($header)) {
-            $header = new Header();
-        }
-        $header = $header->withParameters(...$algo->headerParameters());
-        // ensure that if b64 parameter is used, it's marked critical
-        if ($header->hasB64Payload()) {
-            if (!$header->hasCritical()) {
-                $crit = new CriticalParameter(JWTParameter::P_B64);
-            } else {
-                $crit = $header->critical()->withParamName(JWTParameter::P_B64);
-            }
-            $header = $header->withParameters($crit);
-        }
-        $signature_input = self::_generateSignatureInput($payload, $header);
-        $signature = $algo->computeSignature($signature_input);
-        return new self($header, $payload, $signature_input, $signature);
-    }
+	/**
+	 * Initialize by signing the payload with given algorithm.
+	 *
+	 * @param string $payload JWS Payload
+	 * @param SignatureAlgorithm $algo Signature algorithm
+	 * @param Header|null $header Desired header. Algorithm specific
+	 *        parameters are added automatically.
+	 * @throws \RuntimeException If signature computation fails
+	 * @return self
+	 */
+	public static function sign($payload, SignatureAlgorithm $algo,
+		Header $header = null)
+	{
+		if (!isset($header)) {
+			$header = new Header();
+		}
+		$header = $header->withParameters(...$algo->headerParameters());
+		// ensure that if b64 parameter is used, it's marked critical
+		if ($header->hasB64Payload()) {
+			if (!$header->hasCritical()) {
+				$crit = new CriticalParameter(JWTParameter::P_B64);
+			} else {
+				$crit = $header->critical()->withParamName(JWTParameter::P_B64);
+			}
+			$header = $header->withParameters($crit);
+		}
+		$signature_input = self::_generateSignatureInput($payload, $header);
+		$signature = $algo->computeSignature($signature_input);
+		return new self($header, $payload, $signature_input, $signature);
+	}
     
-    /**
-     * Get JOSE header.
-     *
-     * @return JOSE
-     */
-    public function header()
-    {
-        return new JOSE($this->_protectedHeader);
-    }
+	/**
+	 * Get JOSE header.
+	 *
+	 * @return JOSE
+	 */
+	public function header()
+	{
+		return new JOSE($this->_protectedHeader);
+	}
     
-    /**
-     * Get the signature algorithm name.
-     *
-     * @return string
-     */
-    public function algorithmName()
-    {
-        return $this->header()
-            ->algorithm()
-            ->value();
-    }
+	/**
+	 * Get the signature algorithm name.
+	 *
+	 * @return string
+	 */
+	public function algorithmName()
+	{
+		return $this->header()
+			->algorithm()
+			->value();
+	}
     
-    /**
-     * Check whether JWS is unsecured, that is, contains no signature.
-     *
-     * @return bool
-     */
-    public function isUnsecured()
-    {
-        return $this->algorithmName() == JWA::ALGO_NONE;
-    }
+	/**
+	 * Check whether JWS is unsecured, that is, contains no signature.
+	 *
+	 * @return bool
+	 */
+	public function isUnsecured()
+	{
+		return $this->algorithmName() == JWA::ALGO_NONE;
+	}
     
-    /**
-     * Get the payload.
-     *
-     * @return string
-     */
-    public function payload()
-    {
-        return $this->_payload;
-    }
+	/**
+	 * Get the payload.
+	 *
+	 * @return string
+	 */
+	public function payload()
+	{
+		return $this->_payload;
+	}
     
-    /**
-     * Get the signature.
-     *
-     * @return string
-     */
-    public function signature()
-    {
-        return $this->_signature;
-    }
+	/**
+	 * Get the signature.
+	 *
+	 * @return string
+	 */
+	public function signature()
+	{
+		return $this->_signature;
+	}
     
-    /**
-     * Get the payload encoded for serialization.
-     *
-     * @return string
-     */
-    protected function _encodedPayload()
-    {
-        $b64 = true;
-        if ($this->_protectedHeader->hasB64Payload()) {
-            $b64 = $this->_protectedHeader->B64Payload()->value();
-        }
-        return $b64 ? Base64::urlEncode($this->_payload) : $this->_payload;
-    }
+	/**
+	 * Get the payload encoded for serialization.
+	 *
+	 * @return string
+	 */
+	protected function _encodedPayload()
+	{
+		$b64 = true;
+		if ($this->_protectedHeader->hasB64Payload()) {
+			$b64 = $this->_protectedHeader->B64Payload()->value();
+		}
+		return $b64 ? Base64::urlEncode($this->_payload) : $this->_payload;
+	}
     
-    /**
-     * Validate the signature using explicit algorithm.
-     *
-     * @param SignatureAlgorithm $algo
-     * @throws \UnexpectedValueException If using different signature algorithm
-     *         then specified by the header
-     * @throws \RuntimeException If signature computation fails
-     * @return bool True if signature is valid
-     */
-    public function validate(SignatureAlgorithm $algo)
-    {
-        if ($algo->algorithmParamValue() != $this->algorithmName()) {
-            throw new \UnexpectedValueException("Invalid signature algorithm.");
-        }
-        return $algo->validateSignature($this->_signatureInput,
-            $this->_signature);
-    }
+	/**
+	 * Validate the signature using explicit algorithm.
+	 *
+	 * @param SignatureAlgorithm $algo
+	 * @throws \UnexpectedValueException If using different signature algorithm
+	 *         then specified by the header
+	 * @throws \RuntimeException If signature computation fails
+	 * @return bool True if signature is valid
+	 */
+	public function validate(SignatureAlgorithm $algo)
+	{
+		if ($algo->algorithmParamValue() != $this->algorithmName()) {
+			throw new \UnexpectedValueException("Invalid signature algorithm.");
+		}
+		return $algo->validateSignature($this->_signatureInput,
+			$this->_signature);
+	}
     
-    /**
-     * Validate the signature using the given JWK.
-     *
-     * Signature algorithm is determined from the header.
-     *
-     * @param JWK $jwk JSON Web Key
-     * @throws \RuntimeException If algorithm initialization fails
-     * @return bool True if signature is valid
-     */
-    public function validateWithJWK(JWK $jwk)
-    {
-        $algo = SignatureAlgorithm::fromJWK($jwk, $this->header());
-        return $this->validate($algo);
-    }
+	/**
+	 * Validate the signature using the given JWK.
+	 *
+	 * Signature algorithm is determined from the header.
+	 *
+	 * @param JWK $jwk JSON Web Key
+	 * @throws \RuntimeException If algorithm initialization fails
+	 * @return bool True if signature is valid
+	 */
+	public function validateWithJWK(JWK $jwk)
+	{
+		$algo = SignatureAlgorithm::fromJWK($jwk, $this->header());
+		return $this->validate($algo);
+	}
     
-    /**
-     * Validate the signature using a key from the given JWK set.
-     *
-     * Correct key shall be sought by the key ID indicated by the header.
-     *
-     * @param JWKSet $set Set of JSON Web Keys
-     * @throws \RuntimeException If algorithm initialization fails
-     * @return bool True if signature is valid
-     */
-    public function validateWithJWKSet(JWKSet $set)
-    {
-        if (!count($set)) {
-            throw new \RuntimeException("No keys.");
-        }
-        $factory = new SignatureAlgorithmFactory($this->header());
-        $algo = $factory->algoByKeys($set);
-        return $this->validate($algo);
-    }
+	/**
+	 * Validate the signature using a key from the given JWK set.
+	 *
+	 * Correct key shall be sought by the key ID indicated by the header.
+	 *
+	 * @param JWKSet $set Set of JSON Web Keys
+	 * @throws \RuntimeException If algorithm initialization fails
+	 * @return bool True if signature is valid
+	 */
+	public function validateWithJWKSet(JWKSet $set)
+	{
+		if (!count($set)) {
+			throw new \RuntimeException("No keys.");
+		}
+		$factory = new SignatureAlgorithmFactory($this->header());
+		$algo = $factory->algoByKeys($set);
+		return $this->validate($algo);
+	}
     
-    /**
-     * Convert to compact serialization.
-     *
-     * @return string
-     */
-    public function toCompact()
-    {
-        return Base64::urlEncode($this->_protectedHeader->toJSON()) . "." .
-             $this->_encodedPayload() . "." .
-             Base64::urlEncode($this->_signature);
-    }
+	/**
+	 * Convert to compact serialization.
+	 *
+	 * @return string
+	 */
+	public function toCompact()
+	{
+		return Base64::urlEncode($this->_protectedHeader->toJSON()) . "." .
+			 $this->_encodedPayload() . "." .
+			 Base64::urlEncode($this->_signature);
+	}
     
-    /**
-     * Convert to compact serialization with payload detached.
-     *
-     * @return string
-     */
-    public function toCompactDetached()
-    {
-        return Base64::urlEncode($this->_protectedHeader->toJSON()) . ".." .
-             Base64::urlEncode($this->_signature);
-    }
+	/**
+	 * Convert to compact serialization with payload detached.
+	 *
+	 * @return string
+	 */
+	public function toCompactDetached()
+	{
+		return Base64::urlEncode($this->_protectedHeader->toJSON()) . ".." .
+			 Base64::urlEncode($this->_signature);
+	}
     
-    /**
-     * Generate input for the signature computation.
-     *
-     * @param string $payload Payload
-     * @param Header $header Protected header
-     * @return string
-     */
-    protected static function _generateSignatureInput($payload, Header $header)
-    {
-        $b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
-        $data = Base64::urlEncode($header->toJSON()) . ".";
-        $data .= $b64 ? Base64::urlEncode($payload) : $payload;
-        return $data;
-    }
+	/**
+	 * Generate input for the signature computation.
+	 *
+	 * @param string $payload Payload
+	 * @param Header $header Protected header
+	 * @return string
+	 */
+	protected static function _generateSignatureInput($payload, Header $header)
+	{
+		$b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
+		$data = Base64::urlEncode($header->toJSON()) . ".";
+		$data .= $b64 ? Base64::urlEncode($payload) : $payload;
+		return $data;
+	}
     
-    /**
-     * Convert JWS to string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toCompact();
-    }
+	/**
+	 * Convert JWS to string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toCompact();
+	}
 }

lib/JWX/JWS/Algorithm/ES512Algorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class ES512Algorithm extends ECDSAAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _curveName()
-    {
-        return CurveParameter::CURVE_P521;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _curveName()
+	{
+		return CurveParameter::CURVE_P521;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _mdMethod()
-    {
-        return "sha512";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod()
+	{
+		return "sha512";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_ES512;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_ES512;
+	}
 }

lib/JWX/JWS/Algorithm/HS512Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -11,21 +11,21 @@
  */
 class HS512Algorithm extends HMACAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo()
-    {
-        return "sha512";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo()
+	{
+		return "sha512";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_HS512;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_HS512;
+	}
 }

lib/JWX/JWS/Algorithm/SignatureAlgorithmFactory.php

Indentation +80 added lines, -80 removed lines

@@ -12,89 +12,89 @@
  */
 class SignatureAlgorithmFactory
 {
-    /**
-     * Header.
-     *
-     * @var Header $_header
-     */
-    protected $_header;
+	/**
+	 * Header.
+	 *
+	 * @var Header $_header
+	 */
+	protected $_header;
     
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_HS256 => HS256Algorithm::class,
-        JWA::ALGO_HS384 => HS384Algorithm::class,
-        JWA::ALGO_HS512 => HS512Algorithm::class,
-        JWA::ALGO_RS256 => RS256Algorithm::class,
-        JWA::ALGO_RS384 => RS384Algorithm::class,
-        JWA::ALGO_RS512 => RS512Algorithm::class,
-        JWA::ALGO_ES256 => ES256Algorithm::class,
-        JWA::ALGO_ES384 => ES384Algorithm::class,
-        JWA::ALGO_ES512 => ES512Algorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_HS256 => HS256Algorithm::class,
+		JWA::ALGO_HS384 => HS384Algorithm::class,
+		JWA::ALGO_HS512 => HS512Algorithm::class,
+		JWA::ALGO_RS256 => RS256Algorithm::class,
+		JWA::ALGO_RS384 => RS384Algorithm::class,
+		JWA::ALGO_RS512 => RS512Algorithm::class,
+		JWA::ALGO_ES256 => ES256Algorithm::class,
+		JWA::ALGO_ES384 => ES384Algorithm::class,
+		JWA::ALGO_ES512 => ES512Algorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param Header $header
-     */
-    public function __construct(Header $header)
-    {
-        $this->_header = $header;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Header $header
+	 */
+	public function __construct(Header $header)
+	{
+		$this->_header = $header;
+	}
     
-    /**
-     * Get signature algorithm by given JWK.
-     *
-     * @param JWK $jwk
-     * @return \JWX\JWS\SignatureAlgorithm
-     */
-    public function algoByKey(JWK $jwk)
-    {
-        $alg = JWA::deriveAlgorithmName($this->_header, $jwk);
-        $cls = self::_algoClassByName($alg);
-        return $cls::fromJWK($jwk, $this->_header);
-    }
+	/**
+	 * Get signature algorithm by given JWK.
+	 *
+	 * @param JWK $jwk
+	 * @return \JWX\JWS\SignatureAlgorithm
+	 */
+	public function algoByKey(JWK $jwk)
+	{
+		$alg = JWA::deriveAlgorithmName($this->_header, $jwk);
+		$cls = self::_algoClassByName($alg);
+		return $cls::fromJWK($jwk, $this->_header);
+	}
     
-    /**
-     * Get signature algorithm using a matching key from given JWK set.
-     *
-     * @param JWKSet $set
-     * @throws \UnexpectedValueException If a key cannot be found
-     * @return \JWX\JWS\SignatureAlgorithm
-     */
-    public function algoByKeys(JWKSet $set)
-    {
-        if (!$this->_header->hasKeyID()) {
-            throw new \UnexpectedValueException("No key ID paremeter.");
-        }
-        $id = $this->_header->keyID()->value();
-        if (!$set->hasKeyID($id)) {
-            throw new \UnexpectedValueException("No key for ID '$id'.");
-        }
-        return $this->algoByKey($set->keyByID($id));
-    }
+	/**
+	 * Get signature algorithm using a matching key from given JWK set.
+	 *
+	 * @param JWKSet $set
+	 * @throws \UnexpectedValueException If a key cannot be found
+	 * @return \JWX\JWS\SignatureAlgorithm
+	 */
+	public function algoByKeys(JWKSet $set)
+	{
+		if (!$this->_header->hasKeyID()) {
+			throw new \UnexpectedValueException("No key ID paremeter.");
+		}
+		$id = $this->_header->keyID()->value();
+		if (!$set->hasKeyID($id)) {
+			throw new \UnexpectedValueException("No key for ID '$id'.");
+		}
+		return $this->algoByKey($set->keyByID($id));
+	}
     
-    /**
-     * Get the algorithm implementation class name by an algorithm name.
-     *
-     * @param string $alg Algorithm name
-     * @throws \UnexpectedValueException
-     * @return string Class name
-     */
-    private static function _algoClassByName($alg)
-    {
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException(
-                "Algorithm '$alg' not supported.");
-        }
-        return self::MAP_ALGO_TO_CLASS[$alg];
-    }
+	/**
+	 * Get the algorithm implementation class name by an algorithm name.
+	 *
+	 * @param string $alg Algorithm name
+	 * @throws \UnexpectedValueException
+	 * @return string Class name
+	 */
+	private static function _algoClassByName($alg)
+	{
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException(
+				"Algorithm '$alg' not supported.");
+		}
+		return self::MAP_ALGO_TO_CLASS[$alg];
+	}
 }

lib/JWX/JWS/Algorithm/ES256Algorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class ES256Algorithm extends ECDSAAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _curveName()
-    {
-        return CurveParameter::CURVE_P256;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _curveName()
+	{
+		return CurveParameter::CURVE_P256;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _mdMethod()
-    {
-        return "sha256";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod()
+	{
+		return "sha256";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_ES256;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_ES256;
+	}
 }

lib/JWX/JWS/Algorithm/RS512Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -11,21 +11,21 @@
  */
 class RS512Algorithm extends RSASSAPKCS1Algorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _mdMethod()
-    {
-        return "sha512WithRSAEncryption";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod()
+	{
+		return "sha512WithRSAEncryption";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_RS512;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_RS512;
+	}
 }

lib/JWX/JWS/Algorithm/NoneAlgorithm.php

Indentation +34 added lines, -34 removed lines

@@ -14,41 +14,41 @@
  */
 class NoneAlgorithm extends SignatureAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_NONE;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_NONE;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function computeSignature($data)
-    {
-        return "";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function computeSignature($data)
+	{
+		return "";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function validateSignature($data, $signature)
-    {
-        return $signature === "";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function validateSignature($data, $signature)
+	{
+		return $signature === "";
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters()
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters()
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

lib/JWX/JWS/Algorithm/HS384Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -11,21 +11,21 @@
  */
 class HS384Algorithm extends HMACAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo()
-    {
-        return "sha384";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo()
+	{
+		return "sha384";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_HS384;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_HS384;
+	}
 }