sop / jwx

lib/JWX/JWE/CompressionAlgorithm.php

Indentation +14 added lines, -14 removed lines

@@ -9,20 +9,20 @@
  * Interface for algorithms that may be used to compress and decompress data.
  */
 interface CompressionAlgorithm extends 
-    CompressionAlgorithmParameterValue,
-    HeaderParameters
+	CompressionAlgorithmParameterValue,
+	HeaderParameters
 {
-    /**
-     * Compress data.
-     *
-     * @param string $data Compressed data
-     */
-    public function compress($data);
+	/**
+	 * Compress data.
+	 *
+	 * @param string $data Compressed data
+	 */
+	public function compress($data);
     
-    /**
-     * Decompress data.
-     *
-     * @param string $data Uncompressed data
-     */
-    public function decompress($data);
+	/**
+	 * Decompress data.
+	 *
+	 * @param string $data Uncompressed data
+	 */
+	public function decompress($data);
 }

lib/JWX/JWE/CompressionAlgorithm/CompressionFactory.php

Indentation +44 added lines, -44 removed lines

@@ -10,50 +10,50 @@
  */
 abstract class CompressionFactory
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_DEFLATE => DeflateAlgorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_DEFLATE => DeflateAlgorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Get the compression algorithm by name.
-     *
-     * @param string $name
-     * @throws \UnexpectedValueException If algorithm is not supported
-     * @return \JWX\JWE\CompressionAlgorithm
-     */
-    public static function algoByName($name)
-    {
-        if (!array_key_exists($name, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException(
-                "No compression algorithm '$name'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$name];
-        return new $cls();
-    }
+	/**
+	 * Get the compression algorithm by name.
+	 *
+	 * @param string $name
+	 * @throws \UnexpectedValueException If algorithm is not supported
+	 * @return \JWX\JWE\CompressionAlgorithm
+	 */
+	public static function algoByName($name)
+	{
+		if (!array_key_exists($name, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException(
+				"No compression algorithm '$name'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$name];
+		return new $cls();
+	}
     
-    /**
-     * Get the compression algorithm as specified in the given header.
-     *
-     * @param Header $header Header
-     * @throws \UnexpectedValueException If compression algorithm parameter is
-     *         not present or algorithm is not supported
-     * @return \JWX\JWE\CompressionAlgorithm
-     */
-    public static function algoByHeader(Header $header)
-    {
-        if (!$header->hasCompressionAlgorithm()) {
-            throw new \UnexpectedValueException(
-                "No compression algorithm parameter.");
-        }
-        return self::algoByName($header->compressionAlgorithm()->value());
-    }
+	/**
+	 * Get the compression algorithm as specified in the given header.
+	 *
+	 * @param Header $header Header
+	 * @throws \UnexpectedValueException If compression algorithm parameter is
+	 *         not present or algorithm is not supported
+	 * @return \JWX\JWE\CompressionAlgorithm
+	 */
+	public static function algoByHeader(Header $header)
+	{
+		if (!$header->hasCompressionAlgorithm()) {
+			throw new \UnexpectedValueException(
+				"No compression algorithm parameter.");
+		}
+		return self::algoByName($header->compressionAlgorithm()->value());
+	}
 }

lib/JWX/JWE/CompressionAlgorithm/DeflateAlgorithm.php

Indentation +64 added lines, -64 removed lines

@@ -14,73 +14,73 @@
  */
 class DeflateAlgorithm implements CompressionAlgorithm
 {
-    /**
-     * Compression level.
-     *
-     * @var int $_compressionLevel
-     */
-    protected $_compressionLevel;
+	/**
+	 * Compression level.
+	 *
+	 * @var int $_compressionLevel
+	 */
+	protected $_compressionLevel;
     
-    /**
-     * Constructor.
-     *
-     * @param int $level Compression level 0..9
-     */
-    public function __construct($level = -1)
-    {
-        if ($level < -1 || $level > 9) {
-            throw new \DomainException("Compression level must be -1..9.");
-        }
-        $this->_compressionLevel = (int) $level;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $level Compression level 0..9
+	 */
+	public function __construct($level = -1)
+	{
+		if ($level < -1 || $level > 9) {
+			throw new \DomainException("Compression level must be -1..9.");
+		}
+		$this->_compressionLevel = (int) $level;
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\CompressionAlgorithm::compress()
-     * @throws \RuntimeException
-     */
-    public function compress($data)
-    {
-        $ret = @gzdeflate($data, $this->_compressionLevel);
-        if (false === $ret) {
-            $err = error_get_last();
-            $msg = isset($err) ? $err["message"] : "gzdeflate() failed.";
-            throw new \RuntimeException($msg);
-        }
-        return $ret;
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\CompressionAlgorithm::compress()
+	 * @throws \RuntimeException
+	 */
+	public function compress($data)
+	{
+		$ret = @gzdeflate($data, $this->_compressionLevel);
+		if (false === $ret) {
+			$err = error_get_last();
+			$msg = isset($err) ? $err["message"] : "gzdeflate() failed.";
+			throw new \RuntimeException($msg);
+		}
+		return $ret;
+	}
     
-    /**
-     *
-     * @see \JWX\JWE\CompressionAlgorithm::decompress()
-     * @throws \RuntimeException
-     */
-    public function decompress($data)
-    {
-        $ret = @gzinflate($data);
-        if (false === $ret) {
-            $err = error_get_last();
-            $msg = isset($err) ? $err["message"] : "gzinflate() failed.";
-            throw new \RuntimeException($msg);
-        }
-        return $ret;
-    }
+	/**
+	 *
+	 * @see \JWX\JWE\CompressionAlgorithm::decompress()
+	 * @throws \RuntimeException
+	 */
+	public function decompress($data)
+	{
+		$ret = @gzinflate($data);
+		if (false === $ret) {
+			$err = error_get_last();
+			$msg = isset($err) ? $err["message"] : "gzinflate() failed.";
+			throw new \RuntimeException($msg);
+		}
+		return $ret;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function compressionParamValue()
-    {
-        return JWA::ALGO_DEFLATE;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function compressionParamValue()
+	{
+		return JWA::ALGO_DEFLATE;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function headerParameters()
-    {
-        return array(CompressionAlgorithmParameter::fromAlgorithm($this));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function headerParameters()
+	{
+		return array(CompressionAlgorithmParameter::fromAlgorithm($this));
+	}
 }

lib/JWX/JWE/EncryptionAlgorithm/A256GCMAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class A256GCMAlgorithm extends AESGCMAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function encryptionAlgorithmParamValue()
-    {
-        return JWA::ALGO_A256GCM;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function encryptionAlgorithmParamValue()
+	{
+		return JWA::ALGO_A256GCM;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function keySize()
-    {
-        return 32;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function keySize()
+	{
+		return 32;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _getGCMCipher()
-    {
-        return new AES256Cipher();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _getGCMCipher()
+	{
+		return new AES256Cipher();
+	}
 }

lib/JWX/JWE/EncryptionAlgorithm/A128CBCHS256Algorithm.php

Indentation +56 added lines, -56 removed lines

@@ -11,66 +11,66 @@
  */
 class A128CBCHS256Algorithm extends AESCBCAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function keySize()
-    {
-        return 32;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function keySize()
+	{
+		return 32;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function encryptionAlgorithmParamValue()
-    {
-        return JWA::ALGO_A128CBC_HS256;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function encryptionAlgorithmParamValue()
+	{
+		return JWA::ALGO_A128CBC_HS256;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _cipherMethod()
-    {
-        return "AES-128-CBC";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _cipherMethod()
+	{
+		return "AES-128-CBC";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo()
-    {
-        return "sha256";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo()
+	{
+		return "sha256";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encKeyLen()
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encKeyLen()
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _macKeyLen()
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _macKeyLen()
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _tagLen()
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _tagLen()
+	{
+		return 16;
+	}
 }

lib/JWX/JWE/EncryptionAlgorithm/A128GCMAlgorithm.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
  */
 class A128GCMAlgorithm extends AESGCMAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function encryptionAlgorithmParamValue()
-    {
-        return JWA::ALGO_A128GCM;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function encryptionAlgorithmParamValue()
+	{
+		return JWA::ALGO_A128GCM;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function keySize()
-    {
-        return 16;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function keySize()
+	{
+		return 16;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _getGCMCipher()
-    {
-        return new AES128Cipher();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _getGCMCipher()
+	{
+		return new AES128Cipher();
+	}
 }

lib/JWX/JWE/EncryptionAlgorithm/EncryptionAlgorithmFactory.php

Indentation +49 added lines, -49 removed lines

@@ -10,55 +10,55 @@
  */
 abstract class EncryptionAlgorithmFactory
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_A128CBC_HS256 => A128CBCHS256Algorithm::class,
-        JWA::ALGO_A192CBC_HS384 => A192CBCHS384Algorithm::class,
-        JWA::ALGO_A256CBC_HS512 => A256CBCHS512Algorithm::class,
-        JWA::ALGO_A128GCM => A128GCMAlgorithm::class,
-        JWA::ALGO_A192GCM => A192GCMAlgorithm::class,
-        JWA::ALGO_A256GCM => A256GCMAlgorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_A128CBC_HS256 => A128CBCHS256Algorithm::class,
+		JWA::ALGO_A192CBC_HS384 => A192CBCHS384Algorithm::class,
+		JWA::ALGO_A256CBC_HS512 => A256CBCHS512Algorithm::class,
+		JWA::ALGO_A128GCM => A128GCMAlgorithm::class,
+		JWA::ALGO_A192GCM => A192GCMAlgorithm::class,
+		JWA::ALGO_A256GCM => A256GCMAlgorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Get the content encryption algorithm by algorithm name.
-     *
-     * @param string $name Algorithm name
-     * @throws \UnexpectedValueException If algorithm is not supported.
-     * @return \JWX\JWE\ContentEncryptionAlgorithm
-     */
-    public static function algoByName($name)
-    {
-        if (!array_key_exists($name, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException(
-                "No content encryption algorithm '$name'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$name];
-        return new $cls();
-    }
+	/**
+	 * Get the content encryption algorithm by algorithm name.
+	 *
+	 * @param string $name Algorithm name
+	 * @throws \UnexpectedValueException If algorithm is not supported.
+	 * @return \JWX\JWE\ContentEncryptionAlgorithm
+	 */
+	public static function algoByName($name)
+	{
+		if (!array_key_exists($name, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException(
+				"No content encryption algorithm '$name'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$name];
+		return new $cls();
+	}
     
-    /**
-     * Get the content encryption algorithm as specified in the given header.
-     *
-     * @param Header $header Header
-     * @throws \UnexpectedValueException If content encryption algorithm
-     *         parameter is not present or algorithm is not supported.
-     * @return \JWX\JWE\ContentEncryptionAlgorithm
-     */
-    public static function algoByHeader(Header $header)
-    {
-        if (!$header->hasEncryptionAlgorithm()) {
-            throw new \UnexpectedValueException(
-                "No encryption algorithm parameter.");
-        }
-        return self::algoByName($header->encryptionAlgorithm()->value());
-    }
+	/**
+	 * Get the content encryption algorithm as specified in the given header.
+	 *
+	 * @param Header $header Header
+	 * @throws \UnexpectedValueException If content encryption algorithm
+	 *         parameter is not present or algorithm is not supported.
+	 * @return \JWX\JWE\ContentEncryptionAlgorithm
+	 */
+	public static function algoByHeader(Header $header)
+	{
+		if (!$header->hasEncryptionAlgorithm()) {
+			throw new \UnexpectedValueException(
+				"No encryption algorithm parameter.");
+		}
+		return self::algoByName($header->encryptionAlgorithm()->value());
+	}
 }

lib/JWX/JWE/EncryptionAlgorithm/AESCBCAlgorithm.php

Indentation +204 added lines, -204 removed lines

@@ -13,208 +13,208 @@
  */
 abstract class AESCBCAlgorithm implements ContentEncryptionAlgorithm
 {
-    /**
-     * Get cipher method name that is recognized by OpenSSL.
-     *
-     * @return string
-     */
-    abstract protected function _cipherMethod();
-    
-    /**
-     * Get algorithm name that is recognized by the Hash extension.
-     *
-     * @return string
-     */
-    abstract protected function _hashAlgo();
-    
-    /**
-     * Get length of the encryption key.
-     *
-     * @return int
-     */
-    abstract protected function _encKeyLen();
-    
-    /**
-     * Get length of the MAC key.
-     *
-     * @return int
-     */
-    abstract protected function _macKeyLen();
-    
-    /**
-     * Get length of the authentication tag.
-     *
-     * @return int
-     */
-    abstract protected function _tagLen();
-    
-    /**
-     * Get cipher method and verify that it's supported.
-     *
-     * @throws \RuntimeException
-     * @return string
-     */
-    final protected function _getCipherMethod()
-    {
-        static $supported_ciphers;
-        if (!isset($supported_ciphers)) {
-            $supported_ciphers = array_flip(openssl_get_cipher_methods());
-        }
-        $method = $this->_cipherMethod();
-        if (!isset($supported_ciphers[$method])) {
-            throw new \RuntimeException(
-                "Cipher method $method is not" .
-                     " supported by this version of OpenSSL.");
-        }
-        return $method;
-    }
-    
-    /**
-     * Check that key is valid.
-     *
-     * @param string $key
-     * @throws \RuntimeException
-     */
-    final protected function _validateKey($key)
-    {
-        if (strlen($key) != $this->keySize()) {
-            throw new \RuntimeException("Invalid key size.");
-        }
-    }
-    
-    /**
-     * Check that IV is valid.
-     *
-     * @param string $iv
-     * @throws \RuntimeException
-     */
-    final protected function _validateIV($iv)
-    {
-        $len = openssl_cipher_iv_length($this->_getCipherMethod());
-        if ($len != strlen($iv)) {
-            throw new \RuntimeException("Invalid IV length.");
-        }
-    }
-    
-    /**
-     * Get MAC key from CEK.
-     *
-     * @param string $key
-     * @return string
-     */
-    final protected function _macKey($key)
-    {
-        return substr($key, 0, $this->_macKeyLen());
-    }
-    
-    /**
-     * Get encryption key from CEK.
-     *
-     * @param string $key
-     * @return string
-     */
-    final protected function _encKey($key)
-    {
-        return substr($key, -$this->_encKeyLen());
-    }
-    
-    /**
-     * Compute AL value.
-     *
-     * @param string $aad
-     * @return string 64 bits
-     */
-    final protected function _aadLen($aad)
-    {
-        // truncate on 32 bit hosts
-        if (PHP_INT_SIZE < 8) {
-            return "\0\0\0\0" . pack("N", strlen($aad) * 8);
-        }
-        return pack("J", strlen($aad) * 8);
-    }
-    
-    /**
-     * Compute authentication tag.
-     *
-     * @param string $data
-     * @param string $key CEK
-     * @return string
-     */
-    final protected function _computeAuthTag($data, $key)
-    {
-        $tag = hash_hmac($this->_hashAlgo(), $data, $this->_macKey($key), true);
-        return substr($tag, 0, $this->_tagLen());
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function encrypt($plaintext, $key, $iv, $aad)
-    {
-        $this->_validateKey($key);
-        $this->_validateIV($iv);
-        $ciphertext = openssl_encrypt($plaintext, $this->_getCipherMethod(),
-            $this->_encKey($key), OPENSSL_RAW_DATA, $iv);
-        if (false === $ciphertext) {
-            throw new \RuntimeException(
-                "openssl_encrypt() failed: " . $this->_getLastOpenSSLError());
-        }
-        $auth_data = $aad . $iv . $ciphertext . $this->_aadLen($aad);
-        $auth_tag = $this->_computeAuthTag($auth_data, $key);
-        return [$ciphertext, $auth_tag];
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function decrypt($ciphertext, $key, $iv, $aad, $auth_tag)
-    {
-        $this->_validateKey($key);
-        $this->_validateIV($iv);
-        $auth_data = $aad . $iv . $ciphertext . $this->_aadLen($aad);
-        if ($this->_computeAuthTag($auth_data, $key) != $auth_tag) {
-            throw new AuthenticationException("Message authentication failed.");
-        }
-        $plaintext = openssl_decrypt($ciphertext, $this->_getCipherMethod(),
-            $this->_encKey($key), OPENSSL_RAW_DATA, $iv);
-        if (false === $plaintext) {
-            throw new \RuntimeException(
-                "openssl_decrypt() failed: " . $this->_getLastOpenSSLError());
-        }
-        return $plaintext;
-    }
-    
-    /**
-     * Get last OpenSSL error message.
-     *
-     * @return string|null
-     */
-    protected function _getLastOpenSSLError()
-    {
-        $msg = null;
-        while (false !== ($err = openssl_error_string())) {
-            $msg = $err;
-        }
-        return $msg;
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function ivSize()
-    {
-        return 16;
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function headerParameters()
-    {
-        return array(EncryptionAlgorithmParameter::fromAlgorithm($this));
-    }
+	/**
+	 * Get cipher method name that is recognized by OpenSSL.
+	 *
+	 * @return string
+	 */
+	abstract protected function _cipherMethod();
+    
+	/**
+	 * Get algorithm name that is recognized by the Hash extension.
+	 *
+	 * @return string
+	 */
+	abstract protected function _hashAlgo();
+    
+	/**
+	 * Get length of the encryption key.
+	 *
+	 * @return int
+	 */
+	abstract protected function _encKeyLen();
+    
+	/**
+	 * Get length of the MAC key.
+	 *
+	 * @return int
+	 */
+	abstract protected function _macKeyLen();
+    
+	/**
+	 * Get length of the authentication tag.
+	 *
+	 * @return int
+	 */
+	abstract protected function _tagLen();
+    
+	/**
+	 * Get cipher method and verify that it's supported.
+	 *
+	 * @throws \RuntimeException
+	 * @return string
+	 */
+	final protected function _getCipherMethod()
+	{
+		static $supported_ciphers;
+		if (!isset($supported_ciphers)) {
+			$supported_ciphers = array_flip(openssl_get_cipher_methods());
+		}
+		$method = $this->_cipherMethod();
+		if (!isset($supported_ciphers[$method])) {
+			throw new \RuntimeException(
+				"Cipher method $method is not" .
+					 " supported by this version of OpenSSL.");
+		}
+		return $method;
+	}
+    
+	/**
+	 * Check that key is valid.
+	 *
+	 * @param string $key
+	 * @throws \RuntimeException
+	 */
+	final protected function _validateKey($key)
+	{
+		if (strlen($key) != $this->keySize()) {
+			throw new \RuntimeException("Invalid key size.");
+		}
+	}
+    
+	/**
+	 * Check that IV is valid.
+	 *
+	 * @param string $iv
+	 * @throws \RuntimeException
+	 */
+	final protected function _validateIV($iv)
+	{
+		$len = openssl_cipher_iv_length($this->_getCipherMethod());
+		if ($len != strlen($iv)) {
+			throw new \RuntimeException("Invalid IV length.");
+		}
+	}
+    
+	/**
+	 * Get MAC key from CEK.
+	 *
+	 * @param string $key
+	 * @return string
+	 */
+	final protected function _macKey($key)
+	{
+		return substr($key, 0, $this->_macKeyLen());
+	}
+    
+	/**
+	 * Get encryption key from CEK.
+	 *
+	 * @param string $key
+	 * @return string
+	 */
+	final protected function _encKey($key)
+	{
+		return substr($key, -$this->_encKeyLen());
+	}
+    
+	/**
+	 * Compute AL value.
+	 *
+	 * @param string $aad
+	 * @return string 64 bits
+	 */
+	final protected function _aadLen($aad)
+	{
+		// truncate on 32 bit hosts
+		if (PHP_INT_SIZE < 8) {
+			return "\0\0\0\0" . pack("N", strlen($aad) * 8);
+		}
+		return pack("J", strlen($aad) * 8);
+	}
+    
+	/**
+	 * Compute authentication tag.
+	 *
+	 * @param string $data
+	 * @param string $key CEK
+	 * @return string
+	 */
+	final protected function _computeAuthTag($data, $key)
+	{
+		$tag = hash_hmac($this->_hashAlgo(), $data, $this->_macKey($key), true);
+		return substr($tag, 0, $this->_tagLen());
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function encrypt($plaintext, $key, $iv, $aad)
+	{
+		$this->_validateKey($key);
+		$this->_validateIV($iv);
+		$ciphertext = openssl_encrypt($plaintext, $this->_getCipherMethod(),
+			$this->_encKey($key), OPENSSL_RAW_DATA, $iv);
+		if (false === $ciphertext) {
+			throw new \RuntimeException(
+				"openssl_encrypt() failed: " . $this->_getLastOpenSSLError());
+		}
+		$auth_data = $aad . $iv . $ciphertext . $this->_aadLen($aad);
+		$auth_tag = $this->_computeAuthTag($auth_data, $key);
+		return [$ciphertext, $auth_tag];
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function decrypt($ciphertext, $key, $iv, $aad, $auth_tag)
+	{
+		$this->_validateKey($key);
+		$this->_validateIV($iv);
+		$auth_data = $aad . $iv . $ciphertext . $this->_aadLen($aad);
+		if ($this->_computeAuthTag($auth_data, $key) != $auth_tag) {
+			throw new AuthenticationException("Message authentication failed.");
+		}
+		$plaintext = openssl_decrypt($ciphertext, $this->_getCipherMethod(),
+			$this->_encKey($key), OPENSSL_RAW_DATA, $iv);
+		if (false === $plaintext) {
+			throw new \RuntimeException(
+				"openssl_decrypt() failed: " . $this->_getLastOpenSSLError());
+		}
+		return $plaintext;
+	}
+    
+	/**
+	 * Get last OpenSSL error message.
+	 *
+	 * @return string|null
+	 */
+	protected function _getLastOpenSSLError()
+	{
+		$msg = null;
+		while (false !== ($err = openssl_error_string())) {
+			$msg = $err;
+		}
+		return $msg;
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function ivSize()
+	{
+		return 16;
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function headerParameters()
+	{
+		return array(EncryptionAlgorithmParameter::fromAlgorithm($this));
+	}
 }

lib/JWX/JWE/EncryptionAlgorithm/AESGCMAlgorithm.php

Indentation +83 added lines, -83 removed lines

@@ -15,94 +15,94 @@
  */
 abstract class AESGCMAlgorithm implements ContentEncryptionAlgorithm
 {
-    /**
-     * 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 GCM instance.
-     *
-     * @return GCM
-     */
-    final protected function _getGCM()
-    {
-        return new GCM($this->_getGCMCipher(), 16);
-    }
+	/**
+	 * Get GCM instance.
+	 *
+	 * @return GCM
+	 */
+	final protected function _getGCM()
+	{
+		return new GCM($this->_getGCMCipher(), 16);
+	}
     
-    /**
-     * Check that key is valid.
-     *
-     * @param string $key
-     * @throws \RuntimeException
-     */
-    final protected function _validateKey($key)
-    {
-        if (strlen($key) != $this->keySize()) {
-            throw new \RuntimeException("Invalid key size.");
-        }
-    }
+	/**
+	 * Check that key is valid.
+	 *
+	 * @param string $key
+	 * @throws \RuntimeException
+	 */
+	final protected function _validateKey($key)
+	{
+		if (strlen($key) != $this->keySize()) {
+			throw new \RuntimeException("Invalid key size.");
+		}
+	}
     
-    /**
-     * Check that IV is valid.
-     *
-     * @param string $iv
-     * @throws \RuntimeException
-     */
-    final protected function _validateIV($iv)
-    {
-        if (strlen($iv) != $this->ivSize()) {
-            throw new \RuntimeException("Invalid IV length.");
-        }
-    }
+	/**
+	 * Check that IV is valid.
+	 *
+	 * @param string $iv
+	 * @throws \RuntimeException
+	 */
+	final protected function _validateIV($iv)
+	{
+		if (strlen($iv) != $this->ivSize()) {
+			throw new \RuntimeException("Invalid IV length.");
+		}
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function encrypt($plaintext, $key, $iv, $aad)
-    {
-        $this->_validateKey($key);
-        $this->_validateIV($iv);
-        list($ciphertext, $auth_tag) = $this->_getGCM()->encrypt($plaintext,
-            $aad, $key, $iv);
-        return [$ciphertext, $auth_tag];
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function encrypt($plaintext, $key, $iv, $aad)
+	{
+		$this->_validateKey($key);
+		$this->_validateIV($iv);
+		list($ciphertext, $auth_tag) = $this->_getGCM()->encrypt($plaintext,
+			$aad, $key, $iv);
+		return [$ciphertext, $auth_tag];
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function decrypt($ciphertext, $key, $iv, $aad, $auth_tag)
-    {
-        $this->_validateKey($key);
-        $this->_validateIV($iv);
-        try {
-            $plaintext = $this->_getGCM()->decrypt($ciphertext, $auth_tag, $aad,
-                $key, $iv);
-        } catch (GCMAuthException $e) {
-            throw new AuthenticationException("Message authentication failed.");
-        }
-        return $plaintext;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function decrypt($ciphertext, $key, $iv, $aad, $auth_tag)
+	{
+		$this->_validateKey($key);
+		$this->_validateIV($iv);
+		try {
+			$plaintext = $this->_getGCM()->decrypt($ciphertext, $auth_tag, $aad,
+				$key, $iv);
+		} catch (GCMAuthException $e) {
+			throw new AuthenticationException("Message authentication failed.");
+		}
+		return $plaintext;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function ivSize()
-    {
-        return 12;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function ivSize()
+	{
+		return 12;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function headerParameters()
-    {
-        return array(EncryptionAlgorithmParameter::fromAlgorithm($this));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function headerParameters()
+	{
+		return array(EncryptionAlgorithmParameter::fromAlgorithm($this));
+	}
 }