sop / aes-kw

lib/AESKW/AESKW192.php

Indentation +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@
  */
 class AESKW192 extends Algorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function _cipherMethod(): string
-    {
-        return 'AES-192-ECB';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _cipherMethod(): 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\AESKW;
 

lib/AESKW/AESKeyWrapAlgorithm.php

Indentation +66 added lines, -66 removed lines

@@ -13,73 +13,73 @@
  */
 interface AESKeyWrapAlgorithm
 {
-    /**
-     * Wrap a key using given key encryption key.
-     *
-     * Key length must be at least 64 bits (8 octets) and a multiple
-     * of 64 bits (8 octets).
-     * Use <i>wrapPad</i> to wrap a key of arbitrary length.
-     *
-     * Key encryption key must have a size of underlying AES algorithm,
-     * ie. 128, 196 or 256 bits.
-     *
-     * @see https://tools.ietf.org/html/rfc3394#section-2.2.1
-     *
-     * @param string $key Key to wrap
-     * @param string $kek Key encryption key
-     *
-     * @throws \RuntimeException For invalid inputs
-     *
-     * @return string Ciphertext
-     */
-    public function wrap(string $key, string $kek): string;
+	/**
+	 * Wrap a key using given key encryption key.
+	 *
+	 * Key length must be at least 64 bits (8 octets) and a multiple
+	 * of 64 bits (8 octets).
+	 * Use <i>wrapPad</i> to wrap a key of arbitrary length.
+	 *
+	 * Key encryption key must have a size of underlying AES algorithm,
+	 * ie. 128, 196 or 256 bits.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3394#section-2.2.1
+	 *
+	 * @param string $key Key to wrap
+	 * @param string $kek Key encryption key
+	 *
+	 * @throws \RuntimeException For invalid inputs
+	 *
+	 * @return string Ciphertext
+	 */
+	public function wrap(string $key, string $kek): string;
 
-    /**
-     * Unwrap a key from a ciphertext using given key encryption key.
-     *
-     * @see https://tools.ietf.org/html/rfc3394#section-2.2.2
-     *
-     * @param string $ciphertext Ciphertext of the wrapped key
-     * @param string $kek        Key encryption key
-     *
-     * @throws \RuntimeException For invalid inputs
-     *
-     * @return string Unwrapped key
-     */
-    public function unwrap(string $ciphertext, string $kek): string;
+	/**
+	 * Unwrap a key from a ciphertext using given key encryption key.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3394#section-2.2.2
+	 *
+	 * @param string $ciphertext Ciphertext of the wrapped key
+	 * @param string $kek        Key encryption key
+	 *
+	 * @throws \RuntimeException For invalid inputs
+	 *
+	 * @return string Unwrapped key
+	 */
+	public function unwrap(string $ciphertext, string $kek): string;
 
-    /**
-     * Wrap a key of arbitrary length using given key encryption key.
-     *
-     * This variant of wrapping does not place any restriction on key size.
-     *
-     * Key encryption key has the same restrictions as with <i>wrap</i> method.
-     *
-     * @see https://tools.ietf.org/html/rfc5649#section-4.1
-     *
-     * @param string $key Key to wrap
-     * @param string $kek Key encryption key
-     *
-     * @throws \RuntimeException For invalid inputs
-     *
-     * @return string Ciphertext
-     */
-    public function wrapPad(string $key, string $kek): string;
+	/**
+	 * Wrap a key of arbitrary length using given key encryption key.
+	 *
+	 * This variant of wrapping does not place any restriction on key size.
+	 *
+	 * Key encryption key has the same restrictions as with <i>wrap</i> method.
+	 *
+	 * @see https://tools.ietf.org/html/rfc5649#section-4.1
+	 *
+	 * @param string $key Key to wrap
+	 * @param string $kek Key encryption key
+	 *
+	 * @throws \RuntimeException For invalid inputs
+	 *
+	 * @return string Ciphertext
+	 */
+	public function wrapPad(string $key, string $kek): string;
 
-    /**
-     * Unwrap a key from a padded ciphertext using given key encryption key.
-     *
-     * This variant of unwrapping must be used if the key was wrapped using
-     * <i>wrapPad</i>.
-     *
-     * @see https://tools.ietf.org/html/rfc5649#section-4.2
-     *
-     * @param string $ciphertext Ciphertext of the wrapped and padded key
-     * @param string $kek        Key encryption key
-     *
-     * @throws \RuntimeException For invalid inputs
-     *
-     * @return string Unwrapped key
-     */
-    public function unwrapPad(string $ciphertext, string $kek): string;
+	/**
+	 * Unwrap a key from a padded ciphertext using given key encryption key.
+	 *
+	 * This variant of unwrapping must be used if the key was wrapped using
+	 * <i>wrapPad</i>.
+	 *
+	 * @see https://tools.ietf.org/html/rfc5649#section-4.2
+	 *
+	 * @param string $ciphertext Ciphertext of the wrapped and padded key
+	 * @param string $kek        Key encryption key
+	 *
+	 * @throws \RuntimeException For invalid inputs
+	 *
+	 * @return string Unwrapped key
+	 */
+	public function unwrapPad(string $ciphertext, string $kek): string;
 }

Spacing +1 added lines, -1 removed lines

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

lib/AESKW/AESKW128.php

Indentation +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@
  */
 class AESKW128 extends Algorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function _cipherMethod(): string
-    {
-        return 'AES-128-ECB';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _cipherMethod(): 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\AESKW;
 

lib/AESKW/Algorithm.php

Indentation +470 added lines, -470 removed lines

@@ -11,496 +11,496 @@
  */
 abstract class Algorithm implements AESKeyWrapAlgorithm
 {
-    /**
-     * Default initial value.
-     *
-     * @see https://tools.ietf.org/html/rfc3394#section-2.2.3.1
-     *
-     * @var string
-     */
-    const DEFAULT_IV = "\xA6\xA6\xA6\xA6\xA6\xA6\xA6\xA6";
+	/**
+	 * Default initial value.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3394#section-2.2.3.1
+	 *
+	 * @var string
+	 */
+	const DEFAULT_IV = "\xA6\xA6\xA6\xA6\xA6\xA6\xA6\xA6";
 
-    /**
-     * High order bytes of the alternative initial value for padding.
-     *
-     * @see https://tools.ietf.org/html/rfc5649#section-3
-     *
-     * @var string
-     */
-    const AIV_HI = "\xA6\x59\x59\xA6";
+	/**
+	 * High order bytes of the alternative initial value for padding.
+	 *
+	 * @see https://tools.ietf.org/html/rfc5649#section-3
+	 *
+	 * @var string
+	 */
+	const AIV_HI = "\xA6\x59\x59\xA6";
 
-    /**
-     * Initial value.
-     *
-     * @var string
-     */
-    protected $_iv;
+	/**
+	 * Initial value.
+	 *
+	 * @var string
+	 */
+	protected $_iv;
 
-    /**
-     * Constructor.
-     *
-     * @param string $iv Initial value
-     */
-    public function __construct(string $iv = self::DEFAULT_IV)
-    {
-        if (8 != strlen($iv)) {
-            throw new \UnexpectedValueException('IV size must be 64 bits.');
-        }
-        $this->_iv = $iv;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $iv Initial value
+	 */
+	public function __construct(string $iv = self::DEFAULT_IV)
+	{
+		if (8 != strlen($iv)) {
+			throw new \UnexpectedValueException('IV size must be 64 bits.');
+		}
+		$this->_iv = $iv;
+	}
 
-    /**
-     * Wrap a key using given key encryption key.
-     *
-     * Key length must be at least 64 bits (8 octets) and a multiple
-     * of 64 bits (8 octets).
-     * Use <i>wrapPad</i> to wrap a key of arbitrary length.
-     *
-     * Key encryption key must have a size of underlying AES algorithm,
-     * ie. 128, 196 or 256 bits.
-     *
-     * @param string $key Key to wrap
-     * @param string $kek Key encryption key
-     *
-     * @throws \UnexpectedValueException If the key length is invalid
-     *
-     * @return string Ciphertext
-     */
-    public function wrap(string $key, string $kek): string
-    {
-        $key_len = strlen($key);
-        // rfc3394 dictates n to be at least 2
-        if ($key_len < 16) {
-            throw new \UnexpectedValueException(
-                'Key length must be at least 16 octets.');
-        }
-        if (0 !== $key_len % 8) {
-            throw new \UnexpectedValueException(
-                'Key length must be a multiple of 64 bits.');
-        }
-        $this->_checkKEKSize($kek);
-        // P = plaintext as 64 bit blocks
-        $P = [];
-        $i = 1;
-        foreach (str_split($key, 8) as $val) {
-            $P[$i++] = $val;
-        }
-        $C = $this->_wrapBlocks($P, $kek, $this->_iv);
-        return implode('', $C);
-    }
+	/**
+	 * Wrap a key using given key encryption key.
+	 *
+	 * Key length must be at least 64 bits (8 octets) and a multiple
+	 * of 64 bits (8 octets).
+	 * Use <i>wrapPad</i> to wrap a key of arbitrary length.
+	 *
+	 * Key encryption key must have a size of underlying AES algorithm,
+	 * ie. 128, 196 or 256 bits.
+	 *
+	 * @param string $key Key to wrap
+	 * @param string $kek Key encryption key
+	 *
+	 * @throws \UnexpectedValueException If the key length is invalid
+	 *
+	 * @return string Ciphertext
+	 */
+	public function wrap(string $key, string $kek): string
+	{
+		$key_len = strlen($key);
+		// rfc3394 dictates n to be at least 2
+		if ($key_len < 16) {
+			throw new \UnexpectedValueException(
+				'Key length must be at least 16 octets.');
+		}
+		if (0 !== $key_len % 8) {
+			throw new \UnexpectedValueException(
+				'Key length must be a multiple of 64 bits.');
+		}
+		$this->_checkKEKSize($kek);
+		// P = plaintext as 64 bit blocks
+		$P = [];
+		$i = 1;
+		foreach (str_split($key, 8) as $val) {
+			$P[$i++] = $val;
+		}
+		$C = $this->_wrapBlocks($P, $kek, $this->_iv);
+		return implode('', $C);
+	}
 
-    /**
-     * Unwrap a key from a ciphertext using given key encryption key.
-     *
-     * @param string $ciphertext Ciphertext of the wrapped key
-     * @param string $kek        Key encryption key
-     *
-     * @throws \UnexpectedValueException If the ciphertext is invalid
-     *
-     * @return string Unwrapped key
-     */
-    public function unwrap(string $ciphertext, string $kek): string
-    {
-        if (0 !== strlen($ciphertext) % 8) {
-            throw new \UnexpectedValueException(
-                'Ciphertext length must be a multiple of 64 bits.');
-        }
-        $this->_checkKEKSize($kek);
-        // C = ciphertext as 64 bit blocks with integrity check value prepended
-        $C = str_split($ciphertext, 8);
-        [$A, $R] = $this->_unwrapBlocks($C, $kek);
-        // check integrity value
-        if (!hash_equals($this->_iv, $A)) {
-            throw new \UnexpectedValueException('Integrity check failed.');
-        }
-        // output the plaintext
-        $P = array_slice($R, 1, null, true);
-        return implode('', $P);
-    }
+	/**
+	 * Unwrap a key from a ciphertext using given key encryption key.
+	 *
+	 * @param string $ciphertext Ciphertext of the wrapped key
+	 * @param string $kek        Key encryption key
+	 *
+	 * @throws \UnexpectedValueException If the ciphertext is invalid
+	 *
+	 * @return string Unwrapped key
+	 */
+	public function unwrap(string $ciphertext, string $kek): string
+	{
+		if (0 !== strlen($ciphertext) % 8) {
+			throw new \UnexpectedValueException(
+				'Ciphertext length must be a multiple of 64 bits.');
+		}
+		$this->_checkKEKSize($kek);
+		// C = ciphertext as 64 bit blocks with integrity check value prepended
+		$C = str_split($ciphertext, 8);
+		[$A, $R] = $this->_unwrapBlocks($C, $kek);
+		// check integrity value
+		if (!hash_equals($this->_iv, $A)) {
+			throw new \UnexpectedValueException('Integrity check failed.');
+		}
+		// output the plaintext
+		$P = array_slice($R, 1, null, true);
+		return implode('', $P);
+	}
 
-    /**
-     * Wrap a key of arbitrary length using given key encryption key.
-     *
-     * This variant of wrapping does not place any restriction on key size.
-     *
-     * Key encryption key has the same restrictions as with <i>wrap</i> method.
-     *
-     * @param string $key Key to wrap
-     * @param string $kek Key encryption key
-     *
-     * @throws \UnexpectedValueException If the key length is invalid
-     *
-     * @return string Ciphertext
-     */
-    public function wrapPad(string $key, string $kek): string
-    {
-        if (!strlen($key)) {
-            throw new \UnexpectedValueException(
-                'Key must have at least one octet.');
-        }
-        $this->_checkKEKSize($kek);
-        [$key, $aiv] = $this->_padKey($key);
-        // If the padded key contains exactly eight octets,
-        // let the ciphertext be:
-        // C[0] | C[1] = ENC(K, A | P[1]).
-        if (8 == strlen($key)) {
-            return $this->_encrypt($kek, $aiv . $key);
-        }
-        // build plaintext blocks and apply normal wrapping with AIV as an
-        // initial value
-        $P = [];
-        $i = 1;
-        foreach (str_split($key, 8) as $val) {
-            $P[$i++] = $val;
-        }
-        $C = $this->_wrapBlocks($P, $kek, $aiv);
-        return implode('', $C);
-    }
+	/**
+	 * Wrap a key of arbitrary length using given key encryption key.
+	 *
+	 * This variant of wrapping does not place any restriction on key size.
+	 *
+	 * Key encryption key has the same restrictions as with <i>wrap</i> method.
+	 *
+	 * @param string $key Key to wrap
+	 * @param string $kek Key encryption key
+	 *
+	 * @throws \UnexpectedValueException If the key length is invalid
+	 *
+	 * @return string Ciphertext
+	 */
+	public function wrapPad(string $key, string $kek): string
+	{
+		if (!strlen($key)) {
+			throw new \UnexpectedValueException(
+				'Key must have at least one octet.');
+		}
+		$this->_checkKEKSize($kek);
+		[$key, $aiv] = $this->_padKey($key);
+		// If the padded key contains exactly eight octets,
+		// let the ciphertext be:
+		// C[0] | C[1] = ENC(K, A | P[1]).
+		if (8 == strlen($key)) {
+			return $this->_encrypt($kek, $aiv . $key);
+		}
+		// build plaintext blocks and apply normal wrapping with AIV as an
+		// initial value
+		$P = [];
+		$i = 1;
+		foreach (str_split($key, 8) as $val) {
+			$P[$i++] = $val;
+		}
+		$C = $this->_wrapBlocks($P, $kek, $aiv);
+		return implode('', $C);
+	}
 
-    /**
-     * Unwrap a key from a padded ciphertext using given key encryption key.
-     *
-     * This variant of unwrapping must be used if the key was wrapped using
-     * <i>wrapPad</i>.
-     *
-     * @param string $ciphertext Ciphertext of the wrapped and padded key
-     * @param string $kek        Key encryption key
-     *
-     * @throws \UnexpectedValueException If the ciphertext is invalid
-     *
-     * @return string Unwrapped key
-     */
-    public function unwrapPad(string $ciphertext, string $kek): string
-    {
-        if (0 !== strlen($ciphertext) % 8) {
-            throw new \UnexpectedValueException(
-                'Ciphertext length must be a multiple of 64 bits.');
-        }
-        $this->_checkKEKSize($kek);
-        [$P, $A] = $this->_unwrapPaddedCiphertext($ciphertext, $kek);
-        // check message integrity
-        $this->_checkPaddedIntegrity($A);
-        // verify padding
-        $len = $this->_verifyPadding($P, $A);
-        // remove padding and return unwrapped key
-        return substr(implode('', $P), 0, $len);
-    }
+	/**
+	 * Unwrap a key from a padded ciphertext using given key encryption key.
+	 *
+	 * This variant of unwrapping must be used if the key was wrapped using
+	 * <i>wrapPad</i>.
+	 *
+	 * @param string $ciphertext Ciphertext of the wrapped and padded key
+	 * @param string $kek        Key encryption key
+	 *
+	 * @throws \UnexpectedValueException If the ciphertext is invalid
+	 *
+	 * @return string Unwrapped key
+	 */
+	public function unwrapPad(string $ciphertext, string $kek): string
+	{
+		if (0 !== strlen($ciphertext) % 8) {
+			throw new \UnexpectedValueException(
+				'Ciphertext length must be a multiple of 64 bits.');
+		}
+		$this->_checkKEKSize($kek);
+		[$P, $A] = $this->_unwrapPaddedCiphertext($ciphertext, $kek);
+		// check message integrity
+		$this->_checkPaddedIntegrity($A);
+		// verify padding
+		$len = $this->_verifyPadding($P, $A);
+		// remove padding and return unwrapped key
+		return substr(implode('', $P), 0, $len);
+	}
 
-    /**
-     * Get OpenSSL cipher method.
-     *
-     * @return string
-     */
-    abstract protected function _cipherMethod(): string;
+	/**
+	 * Get OpenSSL cipher method.
+	 *
+	 * @return string
+	 */
+	abstract protected function _cipherMethod(): string;
 
-    /**
-     * Get key encryption key size.
-     *
-     * @return int
-     */
-    abstract protected function _keySize(): int;
+	/**
+	 * Get key encryption key size.
+	 *
+	 * @return int
+	 */
+	abstract protected function _keySize(): int;
 
-    /**
-     * Check KEK size.
-     *
-     * @param string $kek
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    protected function _checkKEKSize(string $kek): self
-    {
-        $len = $this->_keySize();
-        if (strlen($kek) != $len) {
-            throw new \UnexpectedValueException("KEK size must be ${len} bytes.");
-        }
-        return $this;
-    }
+	/**
+	 * Check KEK size.
+	 *
+	 * @param string $kek
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	protected function _checkKEKSize(string $kek): self
+	{
+		$len = $this->_keySize();
+		if (strlen($kek) != $len) {
+			throw new \UnexpectedValueException("KEK size must be ${len} bytes.");
+		}
+		return $this;
+	}
 
-    /**
-     * Apply Key Wrap to data blocks.
-     *
-     * Uses alternative version of the key wrap procedure described in the RFC.
-     *
-     * @see https://tools.ietf.org/html/rfc3394#section-2.2.1
-     *
-     * @param string[] $P   Plaintext, n 64-bit values <code>{P1, P2, ...,
-     *                      Pn}</code>
-     * @param string   $kek Key encryption key
-     * @param string   $iv  Initial value
-     *
-     * @return string[] Ciphertext, (n+1) 64-bit values <code>{C0, C1, ...,
-     *                  Cn}</code>
-     */
-    protected function _wrapBlocks(array $P, string $kek, string $iv): array
-    {
-        $n = count($P);
-        // Set A = IV
-        $A = $iv;
-        // For i = 1 to n
-        //   R[i] = P[i]
-        $R = $P;
-        // For j = 0 to 5
-        for ($j = 0; $j <= 5; ++$j) {
-            // For i = 1 to n
-            for ($i = 1; $i <= $n; ++$i) {
-                // B = AES(K, A | R[i])
-                $B = $this->_encrypt($kek, $A . $R[$i]);
-                // A = MSB(64, B) ^ t where t = (n*j)+i
-                $t = $n * $j + $i;
-                $A = $this->_msb64($B) ^ $this->_uint64($t);
-                // R[i] = LSB(64, B)
-                $R[$i] = $this->_lsb64($B);
-            }
-        }
-        // Set C[0] = A
-        $C = [$A];
-        // For i = 1 to n
-        for ($i = 1; $i <= $n; ++$i) {
-            // C[i] = R[i]
-            $C[$i] = $R[$i];
-        }
-        return $C;
-    }
+	/**
+	 * Apply Key Wrap to data blocks.
+	 *
+	 * Uses alternative version of the key wrap procedure described in the RFC.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3394#section-2.2.1
+	 *
+	 * @param string[] $P   Plaintext, n 64-bit values <code>{P1, P2, ...,
+	 *                      Pn}</code>
+	 * @param string   $kek Key encryption key
+	 * @param string   $iv  Initial value
+	 *
+	 * @return string[] Ciphertext, (n+1) 64-bit values <code>{C0, C1, ...,
+	 *                  Cn}</code>
+	 */
+	protected function _wrapBlocks(array $P, string $kek, string $iv): array
+	{
+		$n = count($P);
+		// Set A = IV
+		$A = $iv;
+		// For i = 1 to n
+		//   R[i] = P[i]
+		$R = $P;
+		// For j = 0 to 5
+		for ($j = 0; $j <= 5; ++$j) {
+			// For i = 1 to n
+			for ($i = 1; $i <= $n; ++$i) {
+				// B = AES(K, A | R[i])
+				$B = $this->_encrypt($kek, $A . $R[$i]);
+				// A = MSB(64, B) ^ t where t = (n*j)+i
+				$t = $n * $j + $i;
+				$A = $this->_msb64($B) ^ $this->_uint64($t);
+				// R[i] = LSB(64, B)
+				$R[$i] = $this->_lsb64($B);
+			}
+		}
+		// Set C[0] = A
+		$C = [$A];
+		// For i = 1 to n
+		for ($i = 1; $i <= $n; ++$i) {
+			// C[i] = R[i]
+			$C[$i] = $R[$i];
+		}
+		return $C;
+	}
 
-    /**
-     * Unwrap the padded ciphertext producing plaintext and integrity value.
-     *
-     * @param string $ciphertext Ciphertext
-     * @param string $kek        Encryption key
-     *
-     * @return array Tuple of plaintext <code>{P1, P2, ..., Pn}</code> and
-     *               integrity value <code>A</code>
-     */
-    protected function _unwrapPaddedCiphertext(string $ciphertext, string $kek): array
-    {
-        // split to blocks
-        $C = str_split($ciphertext, 8);
-        $n = count($C) - 1;
-        // if key consists of only one block, recover AIV and padded key as:
-        // A | P[1] = DEC(K, C[0] | C[1])
-        if (1 == $n) {
-            $P = str_split($this->_decrypt($kek, $C[0] . $C[1]), 8);
-            $A = $P[0];
-            unset($P[0]);
-        } else {
-            // apply normal unwrapping
-            [$A, $R] = $this->_unwrapBlocks($C, $kek);
-            $P = array_slice($R, 1, null, true);
-        }
-        return [$P, $A];
-    }
+	/**
+	 * Unwrap the padded ciphertext producing plaintext and integrity value.
+	 *
+	 * @param string $ciphertext Ciphertext
+	 * @param string $kek        Encryption key
+	 *
+	 * @return array Tuple of plaintext <code>{P1, P2, ..., Pn}</code> and
+	 *               integrity value <code>A</code>
+	 */
+	protected function _unwrapPaddedCiphertext(string $ciphertext, string $kek): array
+	{
+		// split to blocks
+		$C = str_split($ciphertext, 8);
+		$n = count($C) - 1;
+		// if key consists of only one block, recover AIV and padded key as:
+		// A | P[1] = DEC(K, C[0] | C[1])
+		if (1 == $n) {
+			$P = str_split($this->_decrypt($kek, $C[0] . $C[1]), 8);
+			$A = $P[0];
+			unset($P[0]);
+		} else {
+			// apply normal unwrapping
+			[$A, $R] = $this->_unwrapBlocks($C, $kek);
+			$P = array_slice($R, 1, null, true);
+		}
+		return [$P, $A];
+	}
 
-    /**
-     * Apply Key Unwrap to data blocks.
-     *
-     * Uses the index based version of key unwrap procedure
-     * described in the RFC.
-     *
-     * Does not compute step 3.
-     *
-     * @see https://tools.ietf.org/html/rfc3394#section-2.2.2
-     *
-     * @param string[] $C   Ciphertext, (n+1) 64-bit values <code>{C0, C1, ...,
-     *                      Cn}</code>
-     * @param string   $kek Key encryption key
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return array Tuple of integrity value <code>A</code> and register
-     *               <code>R</code>
-     */
-    protected function _unwrapBlocks(array $C, string $kek): array
-    {
-        $n = count($C) - 1;
-        if (!$n) {
-            throw new \UnexpectedValueException('No blocks.');
-        }
-        // Set A = C[0]
-        $A = $C[0];
-        // For i = 1 to n
-        //   R[i] = C[i]
-        $R = $C;
-        // For j = 5 to 0
-        for ($j = 5; $j >= 0; --$j) {
-            // For i = n to 1
-            for ($i = $n; $i >= 1; --$i) {
-                // B = AES-1(K, (A ^ t) | R[i]) where t = n*j+i
-                $t = $n * $j + $i;
-                $B = $this->_decrypt($kek, ($A ^ $this->_uint64($t)) . $R[$i]);
-                // A = MSB(64, B)
-                $A = $this->_msb64($B);
-                // R[i] = LSB(64, B)
-                $R[$i] = $this->_lsb64($B);
-            }
-        }
-        return [$A, $R];
-    }
+	/**
+	 * Apply Key Unwrap to data blocks.
+	 *
+	 * Uses the index based version of key unwrap procedure
+	 * described in the RFC.
+	 *
+	 * Does not compute step 3.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3394#section-2.2.2
+	 *
+	 * @param string[] $C   Ciphertext, (n+1) 64-bit values <code>{C0, C1, ...,
+	 *                      Cn}</code>
+	 * @param string   $kek Key encryption key
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return array Tuple of integrity value <code>A</code> and register
+	 *               <code>R</code>
+	 */
+	protected function _unwrapBlocks(array $C, string $kek): array
+	{
+		$n = count($C) - 1;
+		if (!$n) {
+			throw new \UnexpectedValueException('No blocks.');
+		}
+		// Set A = C[0]
+		$A = $C[0];
+		// For i = 1 to n
+		//   R[i] = C[i]
+		$R = $C;
+		// For j = 5 to 0
+		for ($j = 5; $j >= 0; --$j) {
+			// For i = n to 1
+			for ($i = $n; $i >= 1; --$i) {
+				// B = AES-1(K, (A ^ t) | R[i]) where t = n*j+i
+				$t = $n * $j + $i;
+				$B = $this->_decrypt($kek, ($A ^ $this->_uint64($t)) . $R[$i]);
+				// A = MSB(64, B)
+				$A = $this->_msb64($B);
+				// R[i] = LSB(64, B)
+				$R[$i] = $this->_lsb64($B);
+			}
+		}
+		return [$A, $R];
+	}
 
-    /**
-     * Pad a key with zeroes and compute alternative initial value.
-     *
-     * @param string $key Key
-     *
-     * @return array Tuple of padded key and AIV
-     */
-    protected function _padKey(string $key): array
-    {
-        $len = strlen($key);
-        // append padding
-        if (0 != $len % 8) {
-            $key .= str_repeat("\0", 8 - $len % 8);
-        }
-        // compute AIV
-        $mli = pack('N', $len);
-        $aiv = self::AIV_HI . $mli;
-        return [$key, $aiv];
-    }
+	/**
+	 * Pad a key with zeroes and compute alternative initial value.
+	 *
+	 * @param string $key Key
+	 *
+	 * @return array Tuple of padded key and AIV
+	 */
+	protected function _padKey(string $key): array
+	{
+		$len = strlen($key);
+		// append padding
+		if (0 != $len % 8) {
+			$key .= str_repeat("\0", 8 - $len % 8);
+		}
+		// compute AIV
+		$mli = pack('N', $len);
+		$aiv = self::AIV_HI . $mli;
+		return [$key, $aiv];
+	}
 
-    /**
-     * Check that the integrity check value of the padded key is correct.
-     *
-     * @param string $A
-     *
-     * @throws \UnexpectedValueException
-     */
-    protected function _checkPaddedIntegrity(string $A): void
-    {
-        // check that MSB(32,A) = A65959A6
-        if (!hash_equals(self::AIV_HI, substr($A, 0, 4))) {
-            throw new \UnexpectedValueException('Integrity check failed.');
-        }
-    }
+	/**
+	 * Check that the integrity check value of the padded key is correct.
+	 *
+	 * @param string $A
+	 *
+	 * @throws \UnexpectedValueException
+	 */
+	protected function _checkPaddedIntegrity(string $A): void
+	{
+		// check that MSB(32,A) = A65959A6
+		if (!hash_equals(self::AIV_HI, substr($A, 0, 4))) {
+			throw new \UnexpectedValueException('Integrity check failed.');
+		}
+	}
 
-    /**
-     * Verify that the padding of the plaintext is valid.
-     *
-     * @param array  $P Plaintext, n 64-bit values <code>{P1, P2, ...,
-     *                  Pn}</code>
-     * @param string $A Integrity check value
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return int Message length without padding
-     */
-    protected function _verifyPadding(array $P, string $A): int
-    {
-        // extract mli
-        $mli = substr($A, -4);
-        $len = unpack('N1', $mli)[1];
-        // check under and overflow
-        $n = count($P);
-        if (8 * ($n - 1) >= $len || $len > 8 * $n) {
-            throw new \UnexpectedValueException('Invalid message length.');
-        }
-        // if key is padded
-        $b = 8 - ($len % 8);
-        if ($b < 8) {
-            // last block (note that the first index in P is 1)
-            $Pn = $P[$n];
-            // check that padding consists of zeroes
-            if (substr($Pn, -$b) != str_repeat("\0", $b)) {
-                throw new \UnexpectedValueException('Invalid padding.');
-            }
-        }
-        return $len;
-    }
+	/**
+	 * Verify that the padding of the plaintext is valid.
+	 *
+	 * @param array  $P Plaintext, n 64-bit values <code>{P1, P2, ...,
+	 *                  Pn}</code>
+	 * @param string $A Integrity check value
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return int Message length without padding
+	 */
+	protected function _verifyPadding(array $P, string $A): int
+	{
+		// extract mli
+		$mli = substr($A, -4);
+		$len = unpack('N1', $mli)[1];
+		// check under and overflow
+		$n = count($P);
+		if (8 * ($n - 1) >= $len || $len > 8 * $n) {
+			throw new \UnexpectedValueException('Invalid message length.');
+		}
+		// if key is padded
+		$b = 8 - ($len % 8);
+		if ($b < 8) {
+			// last block (note that the first index in P is 1)
+			$Pn = $P[$n];
+			// check that padding consists of zeroes
+			if (substr($Pn, -$b) != str_repeat("\0", $b)) {
+				throw new \UnexpectedValueException('Invalid padding.');
+			}
+		}
+		return $len;
+	}
 
-    /**
-     * Apply AES(K, W) operation (encrypt) to 64 bit block.
-     *
-     * @param string $kek
-     * @param string $block
-     *
-     * @throws \RuntimeException If encrypt fails
-     *
-     * @return string
-     */
-    protected function _encrypt(string $kek, string $block): string
-    {
-        $str = openssl_encrypt($block, $this->_cipherMethod(), $kek,
-            OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-        if (false === $str) {
-            throw new \RuntimeException(
-                'openssl_encrypt() failed: ' . $this->_getLastOpenSSLError());
-        }
-        return $str;
-    }
+	/**
+	 * Apply AES(K, W) operation (encrypt) to 64 bit block.
+	 *
+	 * @param string $kek
+	 * @param string $block
+	 *
+	 * @throws \RuntimeException If encrypt fails
+	 *
+	 * @return string
+	 */
+	protected function _encrypt(string $kek, string $block): string
+	{
+		$str = openssl_encrypt($block, $this->_cipherMethod(), $kek,
+			OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+		if (false === $str) {
+			throw new \RuntimeException(
+				'openssl_encrypt() failed: ' . $this->_getLastOpenSSLError());
+		}
+		return $str;
+	}
 
-    /**
-     * Apply AES-1(K, W) operation (decrypt) to 64 bit block.
-     *
-     * @param string $kek
-     * @param string $block
-     *
-     * @throws \RuntimeException If decrypt fails
-     *
-     * @return string
-     */
-    protected function _decrypt(string $kek, string $block): string
-    {
-        $str = openssl_decrypt($block, $this->_cipherMethod(), $kek,
-            OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-        if (false === $str) {
-            throw new \RuntimeException(
-                'openssl_decrypt() failed: ' . $this->_getLastOpenSSLError());
-        }
-        return $str;
-    }
+	/**
+	 * Apply AES-1(K, W) operation (decrypt) to 64 bit block.
+	 *
+	 * @param string $kek
+	 * @param string $block
+	 *
+	 * @throws \RuntimeException If decrypt fails
+	 *
+	 * @return string
+	 */
+	protected function _decrypt(string $kek, string $block): string
+	{
+		$str = openssl_decrypt($block, $this->_cipherMethod(), $kek,
+			OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
+		if (false === $str) {
+			throw new \RuntimeException(
+				'openssl_decrypt() failed: ' . $this->_getLastOpenSSLError());
+		}
+		return $str;
+	}
 
-    /**
-     * Get the latest OpenSSL error message.
-     *
-     * @return string
-     */
-    protected function _getLastOpenSSLError(): string
-    {
-        $msg = '';
-        while (false !== ($err = openssl_error_string())) {
-            $msg = $err;
-        }
-        return $msg;
-    }
+	/**
+	 * Get the latest OpenSSL error message.
+	 *
+	 * @return string
+	 */
+	protected function _getLastOpenSSLError(): string
+	{
+		$msg = '';
+		while (false !== ($err = openssl_error_string())) {
+			$msg = $err;
+		}
+		return $msg;
+	}
 
-    /**
-     * Take 64 most significant bits from value.
-     *
-     * @param string $val
-     *
-     * @return string
-     */
-    protected function _msb64(string $val): string
-    {
-        return substr($val, 0, 8);
-    }
+	/**
+	 * Take 64 most significant bits from value.
+	 *
+	 * @param string $val
+	 *
+	 * @return string
+	 */
+	protected function _msb64(string $val): string
+	{
+		return substr($val, 0, 8);
+	}
 
-    /**
-     * Take 64 least significant bits from value.
-     *
-     * @param string $val
-     *
-     * @return string
-     */
-    protected function _lsb64(string $val): string
-    {
-        return substr($val, -8);
-    }
+	/**
+	 * Take 64 least significant bits from value.
+	 *
+	 * @param string $val
+	 *
+	 * @return string
+	 */
+	protected function _lsb64(string $val): string
+	{
+		return substr($val, -8);
+	}
 
-    /**
-     * Convert number to 64 bit unsigned integer octet string with
-     * most significant bit first.
-     *
-     * @param int $num
-     *
-     * @return string
-     */
-    protected 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 number to 64 bit unsigned integer octet string with
+	 * most significant bit first.
+	 *
+	 * @param int $num
+	 *
+	 * @return string
+	 */
+	protected 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 +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\AESKW;
 
@@ -144,7 +144,7 @@ 
         // let the ciphertext be:
         // C[0] | C[1] = ENC(K, A | P[1]).
         if (8 == strlen($key)) {
-            return $this->_encrypt($kek, $aiv . $key);
+            return $this->_encrypt($kek, $aiv.$key);
         }
         // build plaintext blocks and apply normal wrapping with AIV as an
         // initial value
@@ -246,7 +246,7 @@ 
             // For i = 1 to n
             for ($i = 1; $i <= $n; ++$i) {
                 // B = AES(K, A | R[i])
-                $B = $this->_encrypt($kek, $A . $R[$i]);
+                $B = $this->_encrypt($kek, $A.$R[$i]);
                 // A = MSB(64, B) ^ t where t = (n*j)+i
                 $t = $n * $j + $i;
                 $A = $this->_msb64($B) ^ $this->_uint64($t);
@@ -281,7 +281,7 @@ 
         // if key consists of only one block, recover AIV and padded key as:
         // A | P[1] = DEC(K, C[0] | C[1])
         if (1 == $n) {
-            $P = str_split($this->_decrypt($kek, $C[0] . $C[1]), 8);
+            $P = str_split($this->_decrypt($kek, $C[0].$C[1]), 8);
             $A = $P[0];
             unset($P[0]);
         } else {
@@ -328,7 +328,7 @@ 
             for ($i = $n; $i >= 1; --$i) {
                 // B = AES-1(K, (A ^ t) | R[i]) where t = n*j+i
                 $t = $n * $j + $i;
-                $B = $this->_decrypt($kek, ($A ^ $this->_uint64($t)) . $R[$i]);
+                $B = $this->_decrypt($kek, ($A ^ $this->_uint64($t)).$R[$i]);
                 // A = MSB(64, B)
                 $A = $this->_msb64($B);
                 // R[i] = LSB(64, B)
@@ -354,7 +354,7 @@ 
         }
         // compute AIV
         $mli = pack('N', $len);
-        $aiv = self::AIV_HI . $mli;
+        $aiv = self::AIV_HI.$mli;
         return [$key, $aiv];
     }
 
@@ -423,7 +423,7 @@ 
             OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
         if (false === $str) {
             throw new \RuntimeException(
-                'openssl_encrypt() failed: ' . $this->_getLastOpenSSLError());
+                'openssl_encrypt() failed: '.$this->_getLastOpenSSLError());
         }
         return $str;
     }
@@ -444,7 +444,7 @@ 
             OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
         if (false === $str) {
             throw new \RuntimeException(
-                'openssl_decrypt() failed: ' . $this->_getLastOpenSSLError());
+                'openssl_decrypt() failed: '.$this->_getLastOpenSSLError());
         }
         return $str;
     }
@@ -499,7 +499,7 @@ 
     {
         // truncate on 32 bit hosts
         if (PHP_INT_SIZE < 8) {
-            return "\0\0\0\0" . pack('N', $num);
+            return "\0\0\0\0".pack('N', $num);
         }
         return pack('J', $num);
     }

lib/AESKW/AESKW256.php

Indentation +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@
  */
 class AESKW256 extends Algorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function _cipherMethod(): string
-    {
-        return 'AES-256-ECB';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _cipherMethod(): 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\AESKW;