sop / jwx

lib/JWX/JWS/Algorithm/ECDSAAlgorithm.php

Indentation +125 added lines, -125 removed lines

@@ -20,138 +20,138 @@
  */
 abstract class ECDSAAlgorithm extends OpenSSLSignatureAlgorithm
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        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_ES256 => ES256Algorithm::class,
+		JWA::ALGO_ES384 => ES384Algorithm::class,
+		JWA::ALGO_ES512 => ES512Algorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Signature size in bytes.
-     *
-     * @var int
-     */
-    private $_signatureSize;
+	/**
+	 * Signature size in bytes.
+	 *
+	 * @var int
+	 */
+	private $_signatureSize;
     
-    /**
-     * Get the name of the curve used by this algorithm.
-     *
-     * @return string
-     */
-    abstract protected function _curveName(): string;
+	/**
+	 * Get the name of the curve used by this algorithm.
+	 *
+	 * @return string
+	 */
+	abstract protected function _curveName(): string;
     
-    /**
-     * Constructor.
-     *
-     * @param ECPublicKeyJWK $pub_key
-     * @param ECPrivateKeyJWK $priv_key
-     */
-    protected function __construct(ECPublicKeyJWK $pub_key,
-        ECPrivateKeyJWK $priv_key = null)
-    {
-        $curve = $pub_key->curveParameter()->value();
-        if ($this->_curveName() != $curve) {
-            throw new \InvalidArgumentException(
-                "Key with " . $this->_curveName() .
-                     " curve expected, got $curve.");
-        }
-        $this->_publicKey = $pub_key;
-        $this->_privateKey = $priv_key;
-        $key_size = $pub_key->curveParameter()->keySizeBits();
-        $this->_signatureSize = intval(ceil($key_size / 8) * 2);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param ECPublicKeyJWK $pub_key
+	 * @param ECPrivateKeyJWK $priv_key
+	 */
+	protected function __construct(ECPublicKeyJWK $pub_key,
+		ECPrivateKeyJWK $priv_key = null)
+	{
+		$curve = $pub_key->curveParameter()->value();
+		if ($this->_curveName() != $curve) {
+			throw new \InvalidArgumentException(
+				"Key with " . $this->_curveName() .
+					 " curve expected, got $curve.");
+		}
+		$this->_publicKey = $pub_key;
+		$this->_privateKey = $priv_key;
+		$key_size = $pub_key->curveParameter()->keySizeBits();
+		$this->_signatureSize = intval(ceil($key_size / 8) * 2);
+	}
     
-    /**
-     * Initialize from a public key.
-     *
-     * @param ECPublicKeyJWK $jwk
-     * @return self
-     */
-    public static function fromPublicKey(ECPublicKeyJWK $jwk): self
-    {
-        return new static($jwk);
-    }
+	/**
+	 * Initialize from a public key.
+	 *
+	 * @param ECPublicKeyJWK $jwk
+	 * @return self
+	 */
+	public static function fromPublicKey(ECPublicKeyJWK $jwk): self
+	{
+		return new static($jwk);
+	}
     
-    /**
-     * Initialize from a private key.
-     *
-     * @param ECPrivateKeyJWK $jwk
-     * @return self
-     */
-    public static function fromPrivateKey(ECPrivateKeyJWK $jwk): self
-    {
-        return new static($jwk->publicKey(), $jwk);
-    }
+	/**
+	 * Initialize from a private key.
+	 *
+	 * @param ECPrivateKeyJWK $jwk
+	 * @return self
+	 */
+	public static function fromPrivateKey(ECPrivateKeyJWK $jwk): self
+	{
+		return new static($jwk->publicKey(), $jwk);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public static function fromJWK(JWK $jwk, Header $header): self
-    {
-        $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(...ECPrivateKeyJWK::MANAGED_PARAMS)) {
-            return $cls::fromPrivateKey(ECPrivateKeyJWK::fromJWK($jwk));
-        }
-        return $cls::fromPublicKey(ECPublicKeyJWK::fromJWK($jwk));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): self
+	{
+		$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(...ECPrivateKeyJWK::MANAGED_PARAMS)) {
+			return $cls::fromPrivateKey(ECPrivateKeyJWK::fromJWK($jwk));
+		}
+		return $cls::fromPublicKey(ECPublicKeyJWK::fromJWK($jwk));
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\Algorithm\OpenSSLSignatureAlgorithm::computeSignature()
-     * @return string
-     */
-    public function computeSignature(string $data): string
-    {
-        // OpenSSL returns ECDSA signature as a DER encoded ECDSA-Sig-Value
-        $der = parent::computeSignature($data);
-        $sig = ECSignature::fromDER($der);
-        $mlen = intval(floor($this->_signatureSize / 2));
-        $signature = ECConversion::numberToOctets($sig->r(), $mlen) .
-             ECConversion::numberToOctets($sig->s(), $mlen);
-        return $signature;
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\Algorithm\OpenSSLSignatureAlgorithm::computeSignature()
+	 * @return string
+	 */
+	public function computeSignature(string $data): string
+	{
+		// OpenSSL returns ECDSA signature as a DER encoded ECDSA-Sig-Value
+		$der = parent::computeSignature($data);
+		$sig = ECSignature::fromDER($der);
+		$mlen = intval(floor($this->_signatureSize / 2));
+		$signature = ECConversion::numberToOctets($sig->r(), $mlen) .
+			 ECConversion::numberToOctets($sig->s(), $mlen);
+		return $signature;
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\Algorithm\OpenSSLSignatureAlgorithm::validateSignature()
-     * @return bool
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        if (strlen($signature) != $this->_signatureSize) {
-            throw new \UnexpectedValueException("Invalid signature length.");
-        }
-        list($r_octets, $s_octets) = str_split($signature,
-            intval(floor($this->_signatureSize / 2)));
-        // convert signature to DER sequence for OpenSSL
-        $r = ECConversion::octetsToNumber($r_octets);
-        $s = ECConversion::octetsToNumber($s_octets);
-        $sig = new ECSignature($r, $s);
-        return parent::validateSignature($data, $sig->toDER());
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\Algorithm\OpenSSLSignatureAlgorithm::validateSignature()
+	 * @return bool
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		if (strlen($signature) != $this->_signatureSize) {
+			throw new \UnexpectedValueException("Invalid signature length.");
+		}
+		list($r_octets, $s_octets) = str_split($signature,
+			intval(floor($this->_signatureSize / 2)));
+		// convert signature to DER sequence for OpenSSL
+		$r = ECConversion::octetsToNumber($r_octets);
+		$s = ECConversion::octetsToNumber($s_octets);
+		$sig = new ECSignature($r, $s);
+		return parent::validateSignature($data, $sig->toDER());
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

lib/JWX/JWS/Algorithm/RS256Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -13,21 +13,21 @@
  */
 class RS256Algorithm extends RSASSAPKCS1Algorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): string
-    {
-        return "sha256WithRSAEncryption";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): string
+	{
+		return "sha256WithRSAEncryption";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_RS256;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_RS256;
+	}
 }

lib/JWX/JWS/Algorithm/ES256Algorithm.php

Indentation +24 added lines, -24 removed lines

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

lib/JWX/JWS/Algorithm/ES384Algorithm.php

Indentation +24 added lines, -24 removed lines

@@ -14,30 +14,30 @@
  */
 class ES384Algorithm extends ECDSAAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _curveName(): string
-    {
-        return CurveParameter::CURVE_P384;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _curveName(): string
+	{
+		return CurveParameter::CURVE_P384;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): string
-    {
-        return "sha384";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): string
+	{
+		return "sha384";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_ES384;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_ES384;
+	}
 }

lib/JWX/JWS/Algorithm/HS512Algorithm.php

Indentation +16 added lines, -16 removed lines

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

lib/JWX/JWS/Algorithm/SignatureAlgorithmFactory.php

Indentation +80 added lines, -80 removed lines

@@ -15,89 +15,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 SignatureAlgorithm
-     */
-    public function algoByKey(JWK $jwk): SignatureAlgorithm
-    {
-        $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 SignatureAlgorithm
+	 */
+	public function algoByKey(JWK $jwk): SignatureAlgorithm
+	{
+		$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 SignatureAlgorithm
-     */
-    public function algoByKeys(JWKSet $set): SignatureAlgorithm
-    {
-        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 SignatureAlgorithm
+	 */
+	public function algoByKeys(JWKSet $set): SignatureAlgorithm
+	{
+		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(string $alg): string
-    {
-        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(string $alg): string
+	{
+		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/RS512Algorithm.php

Indentation +16 added lines, -16 removed lines

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

lib/JWX/JWS/Algorithm/RS384Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -13,21 +13,21 @@
  */
 class RS384Algorithm extends RSASSAPKCS1Algorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): string
-    {
-        return "sha384WithRSAEncryption";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): string
+	{
+		return "sha384WithRSAEncryption";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_RS384;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_RS384;
+	}
 }

lib/JWX/JWS/Algorithm/RSASSAPKCS1Algorithm.php

Indentation +75 added lines, -75 removed lines

@@ -18,84 +18,84 @@
  */
 abstract class RSASSAPKCS1Algorithm extends OpenSSLSignatureAlgorithm
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_RS256 => RS256Algorithm::class,
-        JWA::ALGO_RS384 => RS384Algorithm::class,
-        JWA::ALGO_RS512 => RS512Algorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_RS256 => RS256Algorithm::class,
+		JWA::ALGO_RS384 => RS384Algorithm::class,
+		JWA::ALGO_RS512 => RS512Algorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param RSAPublicKeyJWK $pub_key
-     * @param RSAPrivateKeyJWK $priv_key
-     */
-    protected function __construct(RSAPublicKeyJWK $pub_key,
-        RSAPrivateKeyJWK $priv_key = null)
-    {
-        $this->_publicKey = $pub_key;
-        $this->_privateKey = $priv_key;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param RSAPublicKeyJWK $pub_key
+	 * @param RSAPrivateKeyJWK $priv_key
+	 */
+	protected function __construct(RSAPublicKeyJWK $pub_key,
+		RSAPrivateKeyJWK $priv_key = null)
+	{
+		$this->_publicKey = $pub_key;
+		$this->_privateKey = $priv_key;
+	}
     
-    /**
-     * Initialize from a public key.
-     *
-     * @param RSAPublicKeyJWK $jwk
-     * @return self
-     */
-    public static function fromPublicKey(RSAPublicKeyJWK $jwk): self
-    {
-        return new static($jwk);
-    }
+	/**
+	 * Initialize from a public key.
+	 *
+	 * @param RSAPublicKeyJWK $jwk
+	 * @return self
+	 */
+	public static function fromPublicKey(RSAPublicKeyJWK $jwk): self
+	{
+		return new static($jwk);
+	}
     
-    /**
-     * Initialize from a private key.
-     *
-     * @param RSAPrivateKeyJWK $jwk
-     * @return self
-     */
-    public static function fromPrivateKey(RSAPrivateKeyJWK $jwk): self
-    {
-        return new static($jwk->publicKey(), $jwk);
-    }
+	/**
+	 * Initialize from a private key.
+	 *
+	 * @param RSAPrivateKeyJWK $jwk
+	 * @return self
+	 */
+	public static function fromPrivateKey(RSAPrivateKeyJWK $jwk): self
+	{
+		return new static($jwk->publicKey(), $jwk);
+	}
     
-    /**
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @throws \UnexpectedValueException
-     * @return RSASSAPKCS1Algorithm
-     */
-    public static function fromJWK(JWK $jwk, Header $header): self
-    {
-        $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 RSASSAPKCS1Algorithm
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): self
+	{
+		$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));
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }