sop / gcm

lib/GCM/GHASH.php

Indentation +88 added lines, -88 removed lines

@@ -13,97 +13,97 @@
  */
 class GHASH
 {
-    /**
-     * Fixed R-block.
-     *
-     * @var string
-     */
-    const R = "\xE1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+	/**
+	 * Fixed R-block.
+	 *
+	 * @var string
+	 */
+	const R = "\xE1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
-    /**
-     * Hash subkey.
-     *
-     * @var string
-     */
-    protected $_subkey;
+	/**
+	 * Hash subkey.
+	 *
+	 * @var string
+	 */
+	protected $_subkey;
 
-    /**
-     * Constructor.
-     *
-     * @param string $subkey Hash subkey
-     */
-    public function __construct(string $subkey)
-    {
-        if (16 != strlen($subkey)) {
-            throw new \LengthException('Subkey must be 128 bits.');
-        }
-        $this->_subkey = $subkey;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $subkey Hash subkey
+	 */
+	public function __construct(string $subkey)
+	{
+		if (16 != strlen($subkey)) {
+			throw new \LengthException('Subkey must be 128 bits.');
+		}
+		$this->_subkey = $subkey;
+	}
 
-    /**
-     * Functor method for <code>compute</code>.
-     *
-     * @param string $arg
-     *
-     * @return string
-     */
-    public function __invoke(string $arg): string
-    {
-        return $this->compute($arg);
-    }
+	/**
+	 * Functor method for <code>compute</code>.
+	 *
+	 * @param string $arg
+	 *
+	 * @return string
+	 */
+	public function __invoke(string $arg): string
+	{
+		return $this->compute($arg);
+	}
 
-    /**
-     * Compute hash.
-     *
-     * @param string $X Input string
-     *
-     * @return string Hash
-     */
-    public function compute(string $X): string
-    {
-        $len = strlen($X);
-        if (0 != $len % 16) {
-            throw new \UnexpectedValueException(
-                'Input string must be a multiple of 128 bits.');
-        }
-        $Y = GCM::ZB_128;
-        // number of 128-bit blocks
-        $m = $len >> 4;
-        for ($i = 0; $i < $m; ++$i) {
-            $xi = substr($X, $i << 4, 16);
-            $Y = $this->_mult($Y ^ $xi, $this->_subkey);
-        }
-        return $Y;
-    }
+	/**
+	 * Compute hash.
+	 *
+	 * @param string $X Input string
+	 *
+	 * @return string Hash
+	 */
+	public function compute(string $X): string
+	{
+		$len = strlen($X);
+		if (0 != $len % 16) {
+			throw new \UnexpectedValueException(
+				'Input string must be a multiple of 128 bits.');
+		}
+		$Y = GCM::ZB_128;
+		// number of 128-bit blocks
+		$m = $len >> 4;
+		for ($i = 0; $i < $m; ++$i) {
+			$xi = substr($X, $i << 4, 16);
+			$Y = $this->_mult($Y ^ $xi, $this->_subkey);
+		}
+		return $Y;
+	}
 
-    /**
-     * Apply block multiplication operation.
-     *
-     * See NIST SP-800-38D, chapter 6.3 for the details.
-     *
-     * @param string $X
-     * @param string $Y
-     *
-     * @return string
-     */
-    private function _mult(string $X, string $Y): string
-    {
-        $x = GCM::strToGMP($X);
-        $Z = GCM::strToGMP(GCM::ZB_128);
-        $V = GCM::strToGMP($Y);
-        $R = GCM::strToGMP(self::R);
-        for ($i = 0; $i < 128; ++$i) {
-            // if bit at X[i] is set
-            if (gmp_testbit($x, 127 - $i)) {
-                $Z ^= $V;
-            }
-            // if LSB(Vi) = 0
-            if (!gmp_testbit($V, 0)) {
-                $V >>= 1;
-            } else {
-                $V = ($V >> 1) ^ $R;
-            }
-        }
-        return GCM::gmpToStr($Z, 16);
-    }
+	/**
+	 * Apply block multiplication operation.
+	 *
+	 * See NIST SP-800-38D, chapter 6.3 for the details.
+	 *
+	 * @param string $X
+	 * @param string $Y
+	 *
+	 * @return string
+	 */
+	private function _mult(string $X, string $Y): string
+	{
+		$x = GCM::strToGMP($X);
+		$Z = GCM::strToGMP(GCM::ZB_128);
+		$V = GCM::strToGMP($Y);
+		$R = GCM::strToGMP(self::R);
+		for ($i = 0; $i < 128; ++$i) {
+			// if bit at X[i] is set
+			if (gmp_testbit($x, 127 - $i)) {
+				$Z ^= $V;
+			}
+			// if LSB(Vi) = 0
+			if (!gmp_testbit($V, 0)) {
+				$V >>= 1;
+			} else {
+				$V = ($V >> 1) ^ $R;
+			}
+		}
+		return GCM::gmpToStr($Z, 16);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM;
 

lib/GCM/Cipher/Cipher.php

Indentation +9 added lines, -9 removed lines

@@ -9,13 +9,13 @@
  */
 interface Cipher
 {
-    /**
-     * Encrypt data.
-     *
-     * @param string $data Data to encrypt
-     * @param string $key  Encryption key
-     *
-     * @return string Encrypted data
-     */
-    public function encrypt(string $data, string $key): string;
+	/**
+	 * Encrypt data.
+	 *
+	 * @param string $data Data to encrypt
+	 * @param string $key  Encryption key
+	 *
+	 * @return string Encrypted data
+	 */
+	public function encrypt(string $data, string $key): string;
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM\Cipher;
 

lib/GCM/Cipher/AES/AESCipher.php

Indentation +79 added lines, -79 removed lines

@@ -11,88 +11,88 @@
  */
 abstract class AESCipher implements Cipher
 {
-    /**
-     * Mapping from key size in bits to AES cipher implementation class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_KEYSIZE_TO_CLS = [
-        128 => AES128Cipher::class,
-        192 => AES192Cipher::class,
-        256 => AES256Cipher::class,
-    ];
+	/**
+	 * Mapping from key size in bits to AES cipher implementation class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_KEYSIZE_TO_CLS = [
+		128 => AES128Cipher::class,
+		192 => AES192Cipher::class,
+		256 => AES256Cipher::class,
+	];
 
-    /**
-     * Get AES cipher instance by key length.
-     *
-     * @param int $len Key length in bytes
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromKeyLength(int $len): self
-    {
-        $bits = $len << 3;
-        if (!array_key_exists($bits, self::MAP_KEYSIZE_TO_CLS)) {
-            throw new \UnexpectedValueException(
-                "No AES implementation for ${bits}-bit key size.");
-        }
-        $cls = self::MAP_KEYSIZE_TO_CLS[$bits];
-        return new $cls();
-    }
+	/**
+	 * Get AES cipher instance by key length.
+	 *
+	 * @param int $len Key length in bytes
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	public static function fromKeyLength(int $len): self
+	{
+		$bits = $len << 3;
+		if (!array_key_exists($bits, self::MAP_KEYSIZE_TO_CLS)) {
+			throw new \UnexpectedValueException(
+				"No AES implementation for ${bits}-bit key size.");
+		}
+		$cls = self::MAP_KEYSIZE_TO_CLS[$bits];
+		return new $cls();
+	}
 
-    /**
-     * @see \Sop\GCM\Cipher\Cipher::encrypt()
-     *
-     * @throws \UnexpectedValueException If key size is incorrect
-     * @throws \RuntimeException         For generic errors
-     *
-     * @return string
-     */
-    public function encrypt(string $data, string $key): string
-    {
-        $key_size = $this->_keySize();
-        if (strlen($key) != $key_size) {
-            throw new \UnexpectedValueException(
-                "Key size must be ${key_size} bytes.");
-        }
-        $result = openssl_encrypt($data, $this->_cipherName(), $key,
-            OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-        if (false === $result) {
-            throw new \RuntimeException(
-                'openssl_encrypt() failed: ' . self::_getLastOpenSSLError());
-        }
-        return $result;
-    }
+	/**
+	 * @see \Sop\GCM\Cipher\Cipher::encrypt()
+	 *
+	 * @throws \UnexpectedValueException If key size is incorrect
+	 * @throws \RuntimeException         For generic errors
+	 *
+	 * @return string
+	 */
+	public function encrypt(string $data, string $key): string
+	{
+		$key_size = $this->_keySize();
+		if (strlen($key) != $key_size) {
+			throw new \UnexpectedValueException(
+				"Key size must be ${key_size} bytes.");
+		}
+		$result = openssl_encrypt($data, $this->_cipherName(), $key,
+			OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+		if (false === $result) {
+			throw new \RuntimeException(
+				'openssl_encrypt() failed: ' . self::_getLastOpenSSLError());
+		}
+		return $result;
+	}
 
-    /**
-     * Get the cipher method name recognized by OpenSSL.
-     *
-     * @return string
-     */
-    abstract protected function _cipherName(): string;
+	/**
+	 * Get the cipher method name recognized by OpenSSL.
+	 *
+	 * @return string
+	 */
+	abstract protected function _cipherName(): string;
 
-    /**
-     * Get the key size in bytes.
-     *
-     * @return int
-     */
-    abstract protected function _keySize(): int;
+	/**
+	 * Get the key size in bytes.
+	 *
+	 * @return int
+	 */
+	abstract protected function _keySize(): int;
 
-    /**
-     * Get latest OpenSSL error message.
-     *
-     * @return string
-     */
-    protected static function _getLastOpenSSLError(): string
-    {
-        $msg = '';
-        while (false !== ($err = openssl_error_string())) {
-            $msg = $err;
-        }
-        return $msg;
-    }
+	/**
+	 * Get latest OpenSSL error message.
+	 *
+	 * @return string
+	 */
+	protected static function _getLastOpenSSLError(): string
+	{
+		$msg = '';
+		while (false !== ($err = openssl_error_string())) {
+			$msg = $err;
+		}
+		return $msg;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM\Cipher\AES;
 

lib/GCM/Cipher/AES/AES128Cipher.php

Indentation +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@
  */
 class AES128Cipher extends AESCipher
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function _cipherName(): string
-    {
-        return 'AES-128-ECB';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _cipherName(): string
+	{
+		return 'AES-128-ECB';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _keySize(): int
-    {
-        return 16;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _keySize(): int
+	{
+		return 16;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM\Cipher\AES;
 

lib/GCM/Cipher/AES/AES256Cipher.php

Indentation +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@
  */
 class AES256Cipher extends AESCipher
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function _cipherName(): string
-    {
-        return 'AES-256-ECB';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _cipherName(): string
+	{
+		return 'AES-256-ECB';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _keySize(): int
-    {
-        return 32;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _keySize(): int
+	{
+		return 32;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM\Cipher\AES;
 

lib/GCM/Cipher/AES/AES192Cipher.php

Indentation +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@
  */
 class AES192Cipher extends AESCipher
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function _cipherName(): string
-    {
-        return 'AES-192-ECB';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _cipherName(): string
+	{
+		return 'AES-192-ECB';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _keySize(): int
-    {
-        return 24;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _keySize(): int
+	{
+		return 24;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM\Cipher\AES;
 

lib/GCM/Exception/AuthenticationException.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM\Exception;
 

lib/GCM/AESGCM.php

Indentation +45 added lines, -45 removed lines

@@ -11,51 +11,51 @@
  */
 abstract class AESGCM
 {
-    /**
-     * Encrypt plaintext.
-     *
-     * @param string $plaintext Plaintext to encrypt
-     * @param string $aad       Additional authenticated data
-     * @param string $key       Encryption key
-     * @param string $iv        Initialization vector
-     *
-     * @return array Tuple of ciphertext and authentication tag
-     */
-    public static function encrypt(string $plaintext, string $aad, string $key,
-        string $iv): array
-    {
-        return self::_getGCM(strlen($key))->encrypt($plaintext, $aad, $key, $iv);
-    }
+	/**
+	 * Encrypt plaintext.
+	 *
+	 * @param string $plaintext Plaintext to encrypt
+	 * @param string $aad       Additional authenticated data
+	 * @param string $key       Encryption key
+	 * @param string $iv        Initialization vector
+	 *
+	 * @return array Tuple of ciphertext and authentication tag
+	 */
+	public static function encrypt(string $plaintext, string $aad, string $key,
+		string $iv): array
+	{
+		return self::_getGCM(strlen($key))->encrypt($plaintext, $aad, $key, $iv);
+	}
 
-    /**
-     * Decrypt ciphertext.
-     *
-     * @param string $ciphertext Ciphertext to decrypt
-     * @param string $auth_tag   Authentication tag to verify
-     * @param string $aad        Additional authenticated data
-     * @param string $key        Encryption key
-     * @param string $iv         Initialization vector
-     *
-     * @throws \Sop\GCM\Exception\AuthenticationException If message authentication fails
-     *
-     * @return string Plaintext
-     */
-    public static function decrypt(string $ciphertext, string $auth_tag,
-        string $aad, string $key, string $iv): string
-    {
-        return self::_getGCM(strlen($key))->decrypt($ciphertext, $auth_tag, $aad,
-            $key, $iv);
-    }
+	/**
+	 * Decrypt ciphertext.
+	 *
+	 * @param string $ciphertext Ciphertext to decrypt
+	 * @param string $auth_tag   Authentication tag to verify
+	 * @param string $aad        Additional authenticated data
+	 * @param string $key        Encryption key
+	 * @param string $iv         Initialization vector
+	 *
+	 * @throws \Sop\GCM\Exception\AuthenticationException If message authentication fails
+	 *
+	 * @return string Plaintext
+	 */
+	public static function decrypt(string $ciphertext, string $auth_tag,
+		string $aad, string $key, string $iv): string
+	{
+		return self::_getGCM(strlen($key))->decrypt($ciphertext, $auth_tag, $aad,
+			$key, $iv);
+	}
 
-    /**
-     * Get GCM instance.
-     *
-     * @param int $keylen Key length in bytes
-     *
-     * @return GCM
-     */
-    protected static function _getGCM(int $keylen): GCM
-    {
-        return new GCM(AESCipher::fromKeyLength($keylen));
-    }
+	/**
+	 * Get GCM instance.
+	 *
+	 * @param int $keylen Key length in bytes
+	 *
+	 * @return GCM
+	 */
+	protected static function _getGCM(int $keylen): GCM
+	{
+		return new GCM(AESCipher::fromKeyLength($keylen));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM;
 

lib/GCM/GCM.php

Indentation +265 added lines, -265 removed lines

@@ -15,284 +15,284 @@
  */
 class GCM
 {
-    /**
-     * Block of 64 zero bits.
-     *
-     * @var string
-     */
-    const ZB_64 = "\0\0\0\0\0\0\0\0";
+	/**
+	 * Block of 64 zero bits.
+	 *
+	 * @var string
+	 */
+	const ZB_64 = "\0\0\0\0\0\0\0\0";
 
-    /**
-     * Block of 128 zero bits.
-     *
-     * @var string
-     */
-    const ZB_128 = self::ZB_64 . self::ZB_64;
+	/**
+	 * Block of 128 zero bits.
+	 *
+	 * @var string
+	 */
+	const ZB_128 = self::ZB_64 . self::ZB_64;
 
-    /**
-     * Array of supported t-values, that is, the bit length of the
-     * authentication tag.
-     *
-     * See NIST SP-800-38D section 5.2.1.2 for the details.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const SUPPORTED_T_LEN = [128, 120, 112, 104, 96, 64, 32];
+	/**
+	 * Array of supported t-values, that is, the bit length of the
+	 * authentication tag.
+	 *
+	 * See NIST SP-800-38D section 5.2.1.2 for the details.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const SUPPORTED_T_LEN = [128, 120, 112, 104, 96, 64, 32];
 
-    /**
-     * Cipher.
-     *
-     * @var Cipher
-     */
-    protected $_cipher;
+	/**
+	 * Cipher.
+	 *
+	 * @var Cipher
+	 */
+	protected $_cipher;
 
-    /**
-     * Authentication tag length in bytes.
-     *
-     * @var int
-     */
-    protected $_tagLength;
+	/**
+	 * Authentication tag length in bytes.
+	 *
+	 * @var int
+	 */
+	protected $_tagLength;
 
-    /**
-     * Constructor.
-     *
-     * @param Cipher $cipher     Cipher implementation
-     * @param int    $tag_length Authentication tag length in bytes
-     *
-     * @throws \DomainException If tag length is not supported
-     */
-    public function __construct(Cipher $cipher, int $tag_length = 16)
-    {
-        if (!in_array($tag_length << 3, self::SUPPORTED_T_LEN)) {
-            throw new \DomainException(
-                "Tag length ${tag_length} is not supported.");
-        }
-        $this->_cipher = $cipher;
-        $this->_tagLength = $tag_length;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Cipher $cipher     Cipher implementation
+	 * @param int    $tag_length Authentication tag length in bytes
+	 *
+	 * @throws \DomainException If tag length is not supported
+	 */
+	public function __construct(Cipher $cipher, int $tag_length = 16)
+	{
+		if (!in_array($tag_length << 3, self::SUPPORTED_T_LEN)) {
+			throw new \DomainException(
+				"Tag length ${tag_length} is not supported.");
+		}
+		$this->_cipher = $cipher;
+		$this->_tagLength = $tag_length;
+	}
 
-    /**
-     * Encrypt plaintext.
-     *
-     * @param string $P  Plaintext
-     * @param string $A  Additional authenticated data
-     * @param string $K  Encryption key
-     * @param string $IV Initialization vector
-     *
-     * @throws \RuntimeException For generic errors
-     *
-     * @return array Tuple of ciphertext <code>C</code> and authentication tag
-     *               <code>T</code>
-     */
-    public function encrypt(string $P, string $A, string $K, string $IV): array
-    {
-        $ghash = new GHASH($this->_cipher->encrypt(self::ZB_128, $K));
-        // generate pre-counter block
-        $J0 = $this->_generateJ0($IV, $ghash);
-        // encrypt
-        $C = $this->_gctr(self::_inc32($J0), $P, $K);
-        // generate authentication tag
-        $T = $this->_computeAuthTag($A, $C, $J0, $K, $ghash);
-        return [$C, $T];
-    }
+	/**
+	 * Encrypt plaintext.
+	 *
+	 * @param string $P  Plaintext
+	 * @param string $A  Additional authenticated data
+	 * @param string $K  Encryption key
+	 * @param string $IV Initialization vector
+	 *
+	 * @throws \RuntimeException For generic errors
+	 *
+	 * @return array Tuple of ciphertext <code>C</code> and authentication tag
+	 *               <code>T</code>
+	 */
+	public function encrypt(string $P, string $A, string $K, string $IV): array
+	{
+		$ghash = new GHASH($this->_cipher->encrypt(self::ZB_128, $K));
+		// generate pre-counter block
+		$J0 = $this->_generateJ0($IV, $ghash);
+		// encrypt
+		$C = $this->_gctr(self::_inc32($J0), $P, $K);
+		// generate authentication tag
+		$T = $this->_computeAuthTag($A, $C, $J0, $K, $ghash);
+		return [$C, $T];
+	}
 
-    /**
-     * Decrypt ciphertext.
-     *
-     * @param string $C  Ciphertext
-     * @param string $T  Authentication tag
-     * @param string $A  Additional authenticated data
-     * @param string $K  Encryption key
-     * @param string $IV Initialization vector
-     *
-     * @throws AuthenticationException If message authentication fails
-     * @throws \RuntimeException       For generic errors
-     *
-     * @return string Plaintext <code>P</code>
-     */
-    public function decrypt(string $C, string $T, string $A, string $K,
-        string $IV): string
-    {
-        $ghash = new GHASH($this->_cipher->encrypt(self::ZB_128, $K));
-        // generate pre-counter block
-        $J0 = $this->_generateJ0($IV, $ghash);
-        // generate authentication tag
-        $T2 = $this->_computeAuthTag($A, $C, $J0, $K, $ghash);
-        // check that authentication tag matches
-        if (!hash_equals($T2, $T)) {
-            throw new AuthenticationException('Authentication failed.');
-        }
-        // decrypt
-        return $this->_gctr(self::_inc32($J0), $C, $K);
-    }
+	/**
+	 * Decrypt ciphertext.
+	 *
+	 * @param string $C  Ciphertext
+	 * @param string $T  Authentication tag
+	 * @param string $A  Additional authenticated data
+	 * @param string $K  Encryption key
+	 * @param string $IV Initialization vector
+	 *
+	 * @throws AuthenticationException If message authentication fails
+	 * @throws \RuntimeException       For generic errors
+	 *
+	 * @return string Plaintext <code>P</code>
+	 */
+	public function decrypt(string $C, string $T, string $A, string $K,
+		string $IV): string
+	{
+		$ghash = new GHASH($this->_cipher->encrypt(self::ZB_128, $K));
+		// generate pre-counter block
+		$J0 = $this->_generateJ0($IV, $ghash);
+		// generate authentication tag
+		$T2 = $this->_computeAuthTag($A, $C, $J0, $K, $ghash);
+		// check that authentication tag matches
+		if (!hash_equals($T2, $T)) {
+			throw new AuthenticationException('Authentication failed.');
+		}
+		// decrypt
+		return $this->_gctr(self::_inc32($J0), $C, $K);
+	}
 
-    /**
-     * Convert string to GMP number.
-     *
-     * String is interpreted as an unsigned integer with big endian order and
-     * the most significant byte first.
-     *
-     * @param string $data Binary data
-     *
-     * @return \GMP
-     */
-    public static function strToGMP(string $data): \GMP
-    {
-        $num = gmp_import($data, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        assert($num instanceof \GMP, new \RuntimeException('gmp_import() failed.'));
-        return $num;
-    }
+	/**
+	 * Convert string to GMP number.
+	 *
+	 * String is interpreted as an unsigned integer with big endian order and
+	 * the most significant byte first.
+	 *
+	 * @param string $data Binary data
+	 *
+	 * @return \GMP
+	 */
+	public static function strToGMP(string $data): \GMP
+	{
+		$num = gmp_import($data, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		assert($num instanceof \GMP, new \RuntimeException('gmp_import() failed.'));
+		return $num;
+	}
 
-    /**
-     * Convert GMP number to string.
-     *
-     * Returned string represents an unsigned integer with big endian order and
-     * the most significant byte first.
-     *
-     * @param \GMP $num  GMP number
-     * @param int  $size Width of the string in bytes
-     *
-     * @return string Binary data
-     */
-    public static function gmpToStr(\GMP $num, int $size): string
-    {
-        $data = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        $len = strlen($data);
-        if ($len < $size) {
-            $data = str_repeat("\0", $size - $len) . $data;
-        }
-        return $data;
-    }
+	/**
+	 * Convert GMP number to string.
+	 *
+	 * Returned string represents an unsigned integer with big endian order and
+	 * the most significant byte first.
+	 *
+	 * @param \GMP $num  GMP number
+	 * @param int  $size Width of the string in bytes
+	 *
+	 * @return string Binary data
+	 */
+	public static function gmpToStr(\GMP $num, int $size): string
+	{
+		$data = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		$len = strlen($data);
+		if ($len < $size) {
+			$data = str_repeat("\0", $size - $len) . $data;
+		}
+		return $data;
+	}
 
-    /**
-     * Generate pre-counter block.
-     *
-     * See NIST SP-300-38D section 7.1 step 2 for the details.
-     *
-     * @param string $IV    Initialization vector
-     * @param GHASH  $ghash GHASH functor
-     *
-     * @return string
-     */
-    private function _generateJ0(string $IV, GHASH $ghash): string
-    {
-        // if len(IV) = 96
-        if (12 == strlen($IV)) {
-            return $IV . "\0\0\0\1";
-        }
-        $data = self::_pad128($IV) . self::ZB_64 . self::_uint64(
-            strlen($IV) << 3);
-        return $ghash($data);
-    }
+	/**
+	 * Generate pre-counter block.
+	 *
+	 * See NIST SP-300-38D section 7.1 step 2 for the details.
+	 *
+	 * @param string $IV    Initialization vector
+	 * @param GHASH  $ghash GHASH functor
+	 *
+	 * @return string
+	 */
+	private function _generateJ0(string $IV, GHASH $ghash): string
+	{
+		// if len(IV) = 96
+		if (12 == strlen($IV)) {
+			return $IV . "\0\0\0\1";
+		}
+		$data = self::_pad128($IV) . self::ZB_64 . self::_uint64(
+			strlen($IV) << 3);
+		return $ghash($data);
+	}
 
-    /**
-     * Apply GCTR algorithm.
-     *
-     * See NIST SP-300-38D section 6.5 for the details.
-     *
-     * @param string $ICB Initial counter block
-     * @param string $X   Input data
-     * @param string $K   Encryption key
-     *
-     * @return string Output data
-     */
-    private function _gctr(string $ICB, string $X, string $K): string
-    {
-        // if data is an empty string, return an empty string
-        if ('' == $X) {
-            return '';
-        }
-        // number of blocks
-        $n = ceil(strlen($X) / 16);
-        $CB = $ICB;
-        $Y = '';
-        for ($i = 0; $i < $n - 1; ++$i) {
-            // plaintext block
-            $xi = substr($X, $i << 4, 16);
-            // encrypt block and append to Y
-            $Y .= $xi ^ $this->_cipher->encrypt($CB, $K);
-            // increment counter block
-            $CB = self::_inc32($CB);
-        }
-        // final block
-        $xn = substr($X, $i << 4);
-        // XOR against partial block
-        $Y .= $xn ^ substr($this->_cipher->encrypt($CB, $K), 0, strlen($xn));
-        return $Y;
-    }
+	/**
+	 * Apply GCTR algorithm.
+	 *
+	 * See NIST SP-300-38D section 6.5 for the details.
+	 *
+	 * @param string $ICB Initial counter block
+	 * @param string $X   Input data
+	 * @param string $K   Encryption key
+	 *
+	 * @return string Output data
+	 */
+	private function _gctr(string $ICB, string $X, string $K): string
+	{
+		// if data is an empty string, return an empty string
+		if ('' == $X) {
+			return '';
+		}
+		// number of blocks
+		$n = ceil(strlen($X) / 16);
+		$CB = $ICB;
+		$Y = '';
+		for ($i = 0; $i < $n - 1; ++$i) {
+			// plaintext block
+			$xi = substr($X, $i << 4, 16);
+			// encrypt block and append to Y
+			$Y .= $xi ^ $this->_cipher->encrypt($CB, $K);
+			// increment counter block
+			$CB = self::_inc32($CB);
+		}
+		// final block
+		$xn = substr($X, $i << 4);
+		// XOR against partial block
+		$Y .= $xn ^ substr($this->_cipher->encrypt($CB, $K), 0, strlen($xn));
+		return $Y;
+	}
 
-    /**
-     * Compute authentication tag.
-     *
-     * See NIST SP-300-38D section 7.1 steps 5-6 for the details.
-     *
-     * @param string $A     Additional authenticated data
-     * @param string $C     Ciphertext
-     * @param string $J0    Pre-counter block
-     * @param string $K     Encryption key
-     * @param GHASH  $ghash GHASH functor
-     *
-     * @return string Authentication tag <code>T</code>
-     */
-    private function _computeAuthTag(string $A, string $C, string $J0, string $K,
-        GHASH $ghash): string
-    {
-        $data = self::_pad128($A) . self::_pad128($C) .
-             self::_uint64(strlen($A) << 3) . self::_uint64(strlen($C) << 3);
-        $S = $ghash($data);
-        return substr($this->_gctr($J0, $S, $K), 0, $this->_tagLength);
-    }
+	/**
+	 * Compute authentication tag.
+	 *
+	 * See NIST SP-300-38D section 7.1 steps 5-6 for the details.
+	 *
+	 * @param string $A     Additional authenticated data
+	 * @param string $C     Ciphertext
+	 * @param string $J0    Pre-counter block
+	 * @param string $K     Encryption key
+	 * @param GHASH  $ghash GHASH functor
+	 *
+	 * @return string Authentication tag <code>T</code>
+	 */
+	private function _computeAuthTag(string $A, string $C, string $J0, string $K,
+		GHASH $ghash): string
+	{
+		$data = self::_pad128($A) . self::_pad128($C) .
+			 self::_uint64(strlen($A) << 3) . self::_uint64(strlen($C) << 3);
+		$S = $ghash($data);
+		return substr($this->_gctr($J0, $S, $K), 0, $this->_tagLength);
+	}
 
-    /**
-     * Pad data to 128 bit block boundary.
-     *
-     * @param string $data
-     *
-     * @return string
-     */
-    private static function _pad128(string $data): string
-    {
-        $padlen = 16 - strlen($data) % 16;
-        if (16 != $padlen) {
-            $data .= str_repeat("\0", $padlen);
-        }
-        return $data;
-    }
+	/**
+	 * Pad data to 128 bit block boundary.
+	 *
+	 * @param string $data
+	 *
+	 * @return string
+	 */
+	private static function _pad128(string $data): string
+	{
+		$padlen = 16 - strlen($data) % 16;
+		if (16 != $padlen) {
+			$data .= str_repeat("\0", $padlen);
+		}
+		return $data;
+	}
 
-    /**
-     * Increment 32 rightmost bits of the counter block.
-     *
-     * See NIST SP-300-38D section 6.2 for the details.
-     *
-     * @param string $X
-     *
-     * @return string
-     */
-    private static function _inc32(string $X): string
-    {
-        $Y = substr($X, 0, -4);
-        // increment counter
-        $n = self::strToGMP(substr($X, -4)) + 1;
-        // wrap by using only the 32 rightmost bits
-        $Y .= substr(self::gmpToStr($n, 4), -4);
-        return $Y;
-    }
+	/**
+	 * Increment 32 rightmost bits of the counter block.
+	 *
+	 * See NIST SP-300-38D section 6.2 for the details.
+	 *
+	 * @param string $X
+	 *
+	 * @return string
+	 */
+	private static function _inc32(string $X): string
+	{
+		$Y = substr($X, 0, -4);
+		// increment counter
+		$n = self::strToGMP(substr($X, -4)) + 1;
+		// wrap by using only the 32 rightmost bits
+		$Y .= substr(self::gmpToStr($n, 4), -4);
+		return $Y;
+	}
 
-    /**
-     * Convert integer to 64 bit big endian binary string.
-     *
-     * @param int $num
-     *
-     * @return string
-     */
-    private static function _uint64(int $num): string
-    {
-        // truncate on 32 bit hosts
-        if (PHP_INT_SIZE < 8) {
-            return "\0\0\0\0" . pack('N', $num);
-        }
-        return pack('J', $num);
-    }
+	/**
+	 * Convert integer to 64 bit big endian binary string.
+	 *
+	 * @param int $num
+	 *
+	 * @return string
+	 */
+	private static function _uint64(int $num): string
+	{
+		// truncate on 32 bit hosts
+		if (PHP_INT_SIZE < 8) {
+			return "\0\0\0\0" . pack('N', $num);
+		}
+		return pack('J', $num);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\GCM;