sop / asn1

lib/ASN1/Util/BigInt.php

Indentation +95 added lines, -95 removed lines

@@ -6,107 +6,107 @@
 
 class BigInt
 {
-    /**
-     * Number as a base10 integer string.
-     *
-     * @var string
-     */
-    private $_num;
+	/**
+	 * Number as a base10 integer string.
+	 *
+	 * @var string
+	 */
+	private $_num;
 
-    /**
-     * Number as an integer type.
-     *
-     * @internal Lazily initialized
-     *
-     * @var null|int
-     */
-    private $_intNum;
+	/**
+	 * Number as an integer type.
+	 *
+	 * @internal Lazily initialized
+	 *
+	 * @var null|int
+	 */
+	private $_intNum;
 
-    /**
-     * Constructor.
-     *
-     * @param int|string $num
-     */
-    public function __construct($num)
-    {
-        $this->_num = strval($num);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $num
+	 */
+	public function __construct($num)
+	{
+		$this->_num = strval($num);
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->base10();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->base10();
+	}
 
-    /**
-     * Get the number as a base10 integer string.
-     *
-     * @return string
-     */
-    public function base10(): string
-    {
-        return $this->_num;
-    }
+	/**
+	 * Get the number as a base10 integer string.
+	 *
+	 * @return string
+	 */
+	public function base10(): string
+	{
+		return $this->_num;
+	}
 
-    /**
-     * Get the number as an integer.
-     *
-     * @throws \RuntimeException If number overflows integer size
-     *
-     * @return int
-     */
-    public function intVal(): int
-    {
-        if (!isset($this->_intNum)) {
-            $num = gmp_init($this->_num, 10);
-            if (gmp_cmp($num, $this->_intMaxGmp()) > 0) {
-                throw new \RuntimeException('Integer overflow.');
-            }
-            if (gmp_cmp($num, $this->_intMinGmp()) < 0) {
-                throw new \RuntimeException('Integer underflow.');
-            }
-            $this->_intNum = gmp_intval($num);
-        }
-        return $this->_intNum;
-    }
+	/**
+	 * Get the number as an integer.
+	 *
+	 * @throws \RuntimeException If number overflows integer size
+	 *
+	 * @return int
+	 */
+	public function intVal(): int
+	{
+		if (!isset($this->_intNum)) {
+			$num = gmp_init($this->_num, 10);
+			if (gmp_cmp($num, $this->_intMaxGmp()) > 0) {
+				throw new \RuntimeException('Integer overflow.');
+			}
+			if (gmp_cmp($num, $this->_intMinGmp()) < 0) {
+				throw new \RuntimeException('Integer underflow.');
+			}
+			$this->_intNum = gmp_intval($num);
+		}
+		return $this->_intNum;
+	}
 
-    /**
-     * Get the number as a GMP object.
-     *
-     * @return \GMP
-     */
-    public function gmpObj(): \GMP
-    {
-        return gmp_init($this->_num, 10);
-    }
+	/**
+	 * Get the number as a GMP object.
+	 *
+	 * @return \GMP
+	 */
+	public function gmpObj(): \GMP
+	{
+		return gmp_init($this->_num, 10);
+	}
 
-    /**
-     * Get the maximum integer value.
-     *
-     * @return \GMP
-     */
-    private function _intMaxGmp(): \GMP
-    {
-        static $gmp;
-        if (!isset($gmp)) {
-            $gmp = gmp_init(PHP_INT_MAX, 10);
-        }
-        return $gmp;
-    }
+	/**
+	 * Get the maximum integer value.
+	 *
+	 * @return \GMP
+	 */
+	private function _intMaxGmp(): \GMP
+	{
+		static $gmp;
+		if (!isset($gmp)) {
+			$gmp = gmp_init(PHP_INT_MAX, 10);
+		}
+		return $gmp;
+	}
 
-    /**
-     * Get the minimum integer value.
-     *
-     * @return \GMP
-     */
-    private function _intMinGmp(): \GMP
-    {
-        static $gmp;
-        if (!isset($gmp)) {
-            $gmp = gmp_init(PHP_INT_MIN, 10);
-        }
-        return $gmp;
-    }
+	/**
+	 * Get the minimum integer value.
+	 *
+	 * @return \GMP
+	 */
+	private function _intMinGmp(): \GMP
+	{
+		static $gmp;
+		if (!isset($gmp)) {
+			$gmp = gmp_init(PHP_INT_MIN, 10);
+		}
+		return $gmp;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Component/Identifier.php

Spacing +1 added lines, -1 removed lines

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

Indentation +275 added lines, -275 removed lines

@@ -13,301 +13,301 @@
  */
 class Identifier implements Encodable
 {
-    // Type class enumerations
-    const CLASS_UNIVERSAL = 0b00;
-    const CLASS_APPLICATION = 0b01;
-    const CLASS_CONTEXT_SPECIFIC = 0b10;
-    const CLASS_PRIVATE = 0b11;
+	// Type class enumerations
+	const CLASS_UNIVERSAL = 0b00;
+	const CLASS_APPLICATION = 0b01;
+	const CLASS_CONTEXT_SPECIFIC = 0b10;
+	const CLASS_PRIVATE = 0b11;
 
-    /**
-     * Mapping from type class to human readable name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_CLASS_TO_NAME = [
-        self::CLASS_UNIVERSAL => 'UNIVERSAL',
-        self::CLASS_APPLICATION => 'APPLICATION',
-        self::CLASS_CONTEXT_SPECIFIC => 'CONTEXT SPECIFIC',
-        self::CLASS_PRIVATE => 'PRIVATE',
-    ];
+	/**
+	 * Mapping from type class to human readable name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_CLASS_TO_NAME = [
+		self::CLASS_UNIVERSAL => 'UNIVERSAL',
+		self::CLASS_APPLICATION => 'APPLICATION',
+		self::CLASS_CONTEXT_SPECIFIC => 'CONTEXT SPECIFIC',
+		self::CLASS_PRIVATE => 'PRIVATE',
+	];
 
-    // P/C enumerations
-    const PRIMITIVE = 0b0;
-    const CONSTRUCTED = 0b1;
+	// P/C enumerations
+	const PRIMITIVE = 0b0;
+	const CONSTRUCTED = 0b1;
 
-    /**
-     * Type class.
-     *
-     * @var int
-     */
-    private $_class;
+	/**
+	 * Type class.
+	 *
+	 * @var int
+	 */
+	private $_class;
 
-    /**
-     * Primitive or Constructed.
-     *
-     * @var int
-     */
-    private $_pc;
+	/**
+	 * Primitive or Constructed.
+	 *
+	 * @var int
+	 */
+	private $_pc;
 
-    /**
-     * Content type tag.
-     *
-     * @var BigInt
-     */
-    private $_tag;
+	/**
+	 * Content type tag.
+	 *
+	 * @var BigInt
+	 */
+	private $_tag;
 
-    /**
-     * Constructor.
-     *
-     * @param int        $class Type class
-     * @param int        $pc    Primitive / Constructed
-     * @param int|string $tag   Type tag number
-     */
-    public function __construct(int $class, int $pc, $tag)
-    {
-        $this->_class = 0b11 & $class;
-        $this->_pc = 0b1 & $pc;
-        $this->_tag = new BigInt($tag);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int        $class Type class
+	 * @param int        $pc    Primitive / Constructed
+	 * @param int|string $tag   Type tag number
+	 */
+	public function __construct(int $class, int $pc, $tag)
+	{
+		$this->_class = 0b11 & $class;
+		$this->_pc = 0b1 & $pc;
+		$this->_tag = new BigInt($tag);
+	}
 
-    /**
-     * Decode identifier component from DER data.
-     *
-     * @param string   $data   DER encoded data
-     * @param null|int $offset Reference to the variable that contains offset
-     *                         into the data where to start parsing.
-     *                         Variable is updated to the offset next to the
-     *                         parsed identifier. If null, start from offset 0.
-     *
-     * @throws DecodeException If decoding fails
-     *
-     * @return self
-     */
-    public static function fromDER(string $data, int &$offset = null): Identifier
-    {
-        $idx = $offset ?? 0;
-        $datalen = strlen($data);
-        if ($idx >= $datalen) {
-            throw new DecodeException('Invalid offset.');
-        }
-        $byte = ord($data[$idx++]);
-        // bits 8 and 7 (class)
-        // 0 = universal, 1 = application, 2 = context-specific, 3 = private
-        $class = (0b11000000 & $byte) >> 6;
-        // bit 6 (0 = primitive / 1 = constructed)
-        $pc = (0b00100000 & $byte) >> 5;
-        // bits 5 to 1 (tag number)
-        $tag = (0b00011111 & $byte);
-        // long-form identifier
-        if (0x1f == $tag) {
-            $tag = self::_decodeLongFormTag($data, $idx);
-        }
-        if (isset($offset)) {
-            $offset = $idx;
-        }
-        return new self($class, $pc, $tag);
-    }
+	/**
+	 * Decode identifier component from DER data.
+	 *
+	 * @param string   $data   DER encoded data
+	 * @param null|int $offset Reference to the variable that contains offset
+	 *                         into the data where to start parsing.
+	 *                         Variable is updated to the offset next to the
+	 *                         parsed identifier. If null, start from offset 0.
+	 *
+	 * @throws DecodeException If decoding fails
+	 *
+	 * @return self
+	 */
+	public static function fromDER(string $data, int &$offset = null): Identifier
+	{
+		$idx = $offset ?? 0;
+		$datalen = strlen($data);
+		if ($idx >= $datalen) {
+			throw new DecodeException('Invalid offset.');
+		}
+		$byte = ord($data[$idx++]);
+		// bits 8 and 7 (class)
+		// 0 = universal, 1 = application, 2 = context-specific, 3 = private
+		$class = (0b11000000 & $byte) >> 6;
+		// bit 6 (0 = primitive / 1 = constructed)
+		$pc = (0b00100000 & $byte) >> 5;
+		// bits 5 to 1 (tag number)
+		$tag = (0b00011111 & $byte);
+		// long-form identifier
+		if (0x1f == $tag) {
+			$tag = self::_decodeLongFormTag($data, $idx);
+		}
+		if (isset($offset)) {
+			$offset = $idx;
+		}
+		return new self($class, $pc, $tag);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function toDER(): string
-    {
-        $bytes = [];
-        $byte = $this->_class << 6 | $this->_pc << 5;
-        $tag = $this->_tag->gmpObj();
-        if ($tag < 0x1f) {
-            $bytes[] = $byte | $tag;
-        }
-        // long-form identifier
-        else {
-            $bytes[] = $byte | 0x1f;
-            $octets = [];
-            for (; $tag > 0; $tag >>= 7) {
-                array_push($octets, gmp_intval(0x80 | ($tag & 0x7f)));
-            }
-            // last octet has bit 8 set to zero
-            $octets[0] &= 0x7f;
-            foreach (array_reverse($octets) as $octet) {
-                $bytes[] = $octet;
-            }
-        }
-        return pack('C*', ...$bytes);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function toDER(): string
+	{
+		$bytes = [];
+		$byte = $this->_class << 6 | $this->_pc << 5;
+		$tag = $this->_tag->gmpObj();
+		if ($tag < 0x1f) {
+			$bytes[] = $byte | $tag;
+		}
+		// long-form identifier
+		else {
+			$bytes[] = $byte | 0x1f;
+			$octets = [];
+			for (; $tag > 0; $tag >>= 7) {
+				array_push($octets, gmp_intval(0x80 | ($tag & 0x7f)));
+			}
+			// last octet has bit 8 set to zero
+			$octets[0] &= 0x7f;
+			foreach (array_reverse($octets) as $octet) {
+				$bytes[] = $octet;
+			}
+		}
+		return pack('C*', ...$bytes);
+	}
 
-    /**
-     * Get class of the type.
-     *
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_class;
-    }
+	/**
+	 * Get class of the type.
+	 *
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_class;
+	}
 
-    /**
-     * Get P/C.
-     *
-     * @return int
-     */
-    public function pc(): int
-    {
-        return $this->_pc;
-    }
+	/**
+	 * Get P/C.
+	 *
+	 * @return int
+	 */
+	public function pc(): int
+	{
+		return $this->_pc;
+	}
 
-    /**
-     * Get the tag number.
-     *
-     * @return string Base 10 integer string
-     */
-    public function tag(): string
-    {
-        return $this->_tag->base10();
-    }
+	/**
+	 * Get the tag number.
+	 *
+	 * @return string Base 10 integer string
+	 */
+	public function tag(): string
+	{
+		return $this->_tag->base10();
+	}
 
-    /**
-     * Get the tag as an integer.
-     *
-     * @return int
-     */
-    public function intTag(): int
-    {
-        return $this->_tag->intVal();
-    }
+	/**
+	 * Get the tag as an integer.
+	 *
+	 * @return int
+	 */
+	public function intTag(): int
+	{
+		return $this->_tag->intVal();
+	}
 
-    /**
-     * Check whether type is of an universal class.
-     *
-     * @return bool
-     */
-    public function isUniversal(): bool
-    {
-        return self::CLASS_UNIVERSAL === $this->_class;
-    }
+	/**
+	 * Check whether type is of an universal class.
+	 *
+	 * @return bool
+	 */
+	public function isUniversal(): bool
+	{
+		return self::CLASS_UNIVERSAL === $this->_class;
+	}
 
-    /**
-     * Check whether type is of an application class.
-     *
-     * @return bool
-     */
-    public function isApplication(): bool
-    {
-        return self::CLASS_APPLICATION === $this->_class;
-    }
+	/**
+	 * Check whether type is of an application class.
+	 *
+	 * @return bool
+	 */
+	public function isApplication(): bool
+	{
+		return self::CLASS_APPLICATION === $this->_class;
+	}
 
-    /**
-     * Check whether type is of a context specific class.
-     *
-     * @return bool
-     */
-    public function isContextSpecific(): bool
-    {
-        return self::CLASS_CONTEXT_SPECIFIC === $this->_class;
-    }
+	/**
+	 * Check whether type is of a context specific class.
+	 *
+	 * @return bool
+	 */
+	public function isContextSpecific(): bool
+	{
+		return self::CLASS_CONTEXT_SPECIFIC === $this->_class;
+	}
 
-    /**
-     * Check whether type is of a private class.
-     *
-     * @return bool
-     */
-    public function isPrivate(): bool
-    {
-        return self::CLASS_PRIVATE === $this->_class;
-    }
+	/**
+	 * Check whether type is of a private class.
+	 *
+	 * @return bool
+	 */
+	public function isPrivate(): bool
+	{
+		return self::CLASS_PRIVATE === $this->_class;
+	}
 
-    /**
-     * Check whether content is primitive type.
-     *
-     * @return bool
-     */
-    public function isPrimitive(): bool
-    {
-        return self::PRIMITIVE === $this->_pc;
-    }
+	/**
+	 * Check whether content is primitive type.
+	 *
+	 * @return bool
+	 */
+	public function isPrimitive(): bool
+	{
+		return self::PRIMITIVE === $this->_pc;
+	}
 
-    /**
-     * Check hether content is constructed type.
-     *
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return self::CONSTRUCTED === $this->_pc;
-    }
+	/**
+	 * Check hether content is constructed type.
+	 *
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return self::CONSTRUCTED === $this->_pc;
+	}
 
-    /**
-     * Get self with given type class.
-     *
-     * @param int $class One of <code>CLASS_*</code> enumerations
-     *
-     * @return self
-     */
-    public function withClass(int $class): Identifier
-    {
-        $obj = clone $this;
-        $obj->_class = 0b11 & $class;
-        return $obj;
-    }
+	/**
+	 * Get self with given type class.
+	 *
+	 * @param int $class One of <code>CLASS_*</code> enumerations
+	 *
+	 * @return self
+	 */
+	public function withClass(int $class): Identifier
+	{
+		$obj = clone $this;
+		$obj->_class = 0b11 & $class;
+		return $obj;
+	}
 
-    /**
-     * Get self with given type tag.
-     *
-     * @param int|string $tag Tag number
-     *
-     * @return self
-     */
-    public function withTag($tag): Identifier
-    {
-        $obj = clone $this;
-        $obj->_tag = new BigInt($tag);
-        return $obj;
-    }
+	/**
+	 * Get self with given type tag.
+	 *
+	 * @param int|string $tag Tag number
+	 *
+	 * @return self
+	 */
+	public function withTag($tag): Identifier
+	{
+		$obj = clone $this;
+		$obj->_tag = new BigInt($tag);
+		return $obj;
+	}
 
-    /**
-     * Get human readable name of the type class.
-     *
-     * @param int $class
-     *
-     * @return string
-     */
-    public static function classToName(int $class): string
-    {
-        if (!array_key_exists($class, self::MAP_CLASS_TO_NAME)) {
-            return "CLASS {$class}";
-        }
-        return self::MAP_CLASS_TO_NAME[$class];
-    }
+	/**
+	 * Get human readable name of the type class.
+	 *
+	 * @param int $class
+	 *
+	 * @return string
+	 */
+	public static function classToName(int $class): string
+	{
+		if (!array_key_exists($class, self::MAP_CLASS_TO_NAME)) {
+			return "CLASS {$class}";
+		}
+		return self::MAP_CLASS_TO_NAME[$class];
+	}
 
-    /**
-     * Parse long form tag.
-     *
-     * @param string $data   DER data
-     * @param int    $offset Reference to the variable containing offset to data
-     *
-     * @throws DecodeException If decoding fails
-     *
-     * @return string Tag number
-     */
-    private static function _decodeLongFormTag(string $data, int &$offset): string
-    {
-        $datalen = strlen($data);
-        $tag = gmp_init(0, 10);
-        while (true) {
-            if ($offset >= $datalen) {
-                throw new DecodeException(
-                    'Unexpected end of data while decoding' .
-                    ' long form identifier.');
-            }
-            $byte = ord($data[$offset++]);
-            $tag <<= 7;
-            $tag |= 0x7f & $byte;
-            // last byte has bit 8 set to zero
-            if (!(0x80 & $byte)) {
-                break;
-            }
-        }
-        return gmp_strval($tag, 10);
-    }
+	/**
+	 * Parse long form tag.
+	 *
+	 * @param string $data   DER data
+	 * @param int    $offset Reference to the variable containing offset to data
+	 *
+	 * @throws DecodeException If decoding fails
+	 *
+	 * @return string Tag number
+	 */
+	private static function _decodeLongFormTag(string $data, int &$offset): string
+	{
+		$datalen = strlen($data);
+		$tag = gmp_init(0, 10);
+		while (true) {
+			if ($offset >= $datalen) {
+				throw new DecodeException(
+					'Unexpected end of data while decoding' .
+					' long form identifier.');
+			}
+			$byte = ord($data[$offset++]);
+			$tag <<= 7;
+			$tag |= 0x7f & $byte;
+			// last byte has bit 8 set to zero
+			if (!(0x80 & $byte)) {
+				break;
+			}
+		}
+		return gmp_strval($tag, 10);
+	}
 }

lib/ASN1/Component/Length.php

Indentation +213 added lines, -213 removed lines

@@ -13,226 +13,226 @@
  */
 class Length implements Encodable
 {
-    /**
-     * Length.
-     *
-     * @var BigInt
-     */
-    private $_length;
+	/**
+	 * Length.
+	 *
+	 * @var BigInt
+	 */
+	private $_length;
 
-    /**
-     * Whether length is indefinite.
-     *
-     * @var bool
-     */
-    private $_indefinite;
+	/**
+	 * Whether length is indefinite.
+	 *
+	 * @var bool
+	 */
+	private $_indefinite;
 
-    /**
-     * Constructor.
-     *
-     * @param int|string $length     Length
-     * @param bool       $indefinite Whether length is indefinite
-     */
-    public function __construct($length, bool $indefinite = false)
-    {
-        $this->_length = new BigInt($length);
-        $this->_indefinite = $indefinite;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $length     Length
+	 * @param bool       $indefinite Whether length is indefinite
+	 */
+	public function __construct($length, bool $indefinite = false)
+	{
+		$this->_length = new BigInt($length);
+		$this->_indefinite = $indefinite;
+	}
 
-    /**
-     * Decode length component from DER data.
-     *
-     * @param string   $data   DER encoded data
-     * @param null|int $offset Reference to the variable that contains offset
-     *                         into the data where to start parsing.
-     *                         Variable is updated to the offset next to the
-     *                         parsed length component. If null, start from offset 0.
-     *
-     * @throws DecodeException If decoding fails
-     *
-     * @return self
-     */
-    public static function fromDER(string $data, int &$offset = null): self
-    {
-        $idx = $offset ?? 0;
-        $datalen = strlen($data);
-        if ($idx >= $datalen) {
-            throw new DecodeException(
-                'Unexpected end of data while decoding length.');
-        }
-        $indefinite = false;
-        $byte = ord($data[$idx++]);
-        // bits 7 to 1
-        $length = (0x7f & $byte);
-        // long form
-        if (0x80 & $byte) {
-            if (!$length) {
-                $indefinite = true;
-            } else {
-                if ($idx + $length > $datalen) {
-                    throw new DecodeException(
-                        'Unexpected end of data while decoding long form length.');
-                }
-                $length = self::_decodeLongFormLength($length, $data, $idx);
-            }
-        }
-        if (isset($offset)) {
-            $offset = $idx;
-        }
-        return new self($length, $indefinite);
-    }
+	/**
+	 * Decode length component from DER data.
+	 *
+	 * @param string   $data   DER encoded data
+	 * @param null|int $offset Reference to the variable that contains offset
+	 *                         into the data where to start parsing.
+	 *                         Variable is updated to the offset next to the
+	 *                         parsed length component. If null, start from offset 0.
+	 *
+	 * @throws DecodeException If decoding fails
+	 *
+	 * @return self
+	 */
+	public static function fromDER(string $data, int &$offset = null): self
+	{
+		$idx = $offset ?? 0;
+		$datalen = strlen($data);
+		if ($idx >= $datalen) {
+			throw new DecodeException(
+				'Unexpected end of data while decoding length.');
+		}
+		$indefinite = false;
+		$byte = ord($data[$idx++]);
+		// bits 7 to 1
+		$length = (0x7f & $byte);
+		// long form
+		if (0x80 & $byte) {
+			if (!$length) {
+				$indefinite = true;
+			} else {
+				if ($idx + $length > $datalen) {
+					throw new DecodeException(
+						'Unexpected end of data while decoding long form length.');
+				}
+				$length = self::_decodeLongFormLength($length, $data, $idx);
+			}
+		}
+		if (isset($offset)) {
+			$offset = $idx;
+		}
+		return new self($length, $indefinite);
+	}
 
-    /**
-     * Decode length from DER.
-     *
-     * Throws an exception if length doesn't match with expected or if data
-     * doesn't contain enough bytes.
-     *
-     * Requirement of definite length is relaxed contrary to the specification
-     * (sect. 10.1).
-     *
-     * @see self::fromDER
-     *
-     * @param string   $data     DER data
-     * @param int      $offset   Reference to the offset variable
-     * @param null|int $expected Expected length, null to bypass checking
-     *
-     * @throws DecodeException If decoding or expectation fails
-     *
-     * @return self
-     */
-    public static function expectFromDER(string $data, int &$offset,
-        int $expected = null): self
-    {
-        $idx = $offset;
-        $length = self::fromDER($data, $idx);
-        // if certain length was expected
-        if (isset($expected)) {
-            if ($length->isIndefinite()) {
-                throw new DecodeException('Expected length %d, got indefinite.',
-                    $expected);
-            }
-            if ($expected !== $length->intLength()) {
-                throw new DecodeException(
-                    sprintf('Expected length %d, got %d.', $expected,
-                        $length->intLength()));
-            }
-        }
-        // check that enough data is available
-        if (!$length->isIndefinite() &&
-            strlen($data) < $idx + $length->intLength()) {
-            throw new DecodeException(
-                sprintf('Length %d overflows data, %d bytes left.',
-                    $length->intLength(), strlen($data) - $idx));
-        }
-        $offset = $idx;
-        return $length;
-    }
+	/**
+	 * Decode length from DER.
+	 *
+	 * Throws an exception if length doesn't match with expected or if data
+	 * doesn't contain enough bytes.
+	 *
+	 * Requirement of definite length is relaxed contrary to the specification
+	 * (sect. 10.1).
+	 *
+	 * @see self::fromDER
+	 *
+	 * @param string   $data     DER data
+	 * @param int      $offset   Reference to the offset variable
+	 * @param null|int $expected Expected length, null to bypass checking
+	 *
+	 * @throws DecodeException If decoding or expectation fails
+	 *
+	 * @return self
+	 */
+	public static function expectFromDER(string $data, int &$offset,
+		int $expected = null): self
+	{
+		$idx = $offset;
+		$length = self::fromDER($data, $idx);
+		// if certain length was expected
+		if (isset($expected)) {
+			if ($length->isIndefinite()) {
+				throw new DecodeException('Expected length %d, got indefinite.',
+					$expected);
+			}
+			if ($expected !== $length->intLength()) {
+				throw new DecodeException(
+					sprintf('Expected length %d, got %d.', $expected,
+						$length->intLength()));
+			}
+		}
+		// check that enough data is available
+		if (!$length->isIndefinite() &&
+			strlen($data) < $idx + $length->intLength()) {
+			throw new DecodeException(
+				sprintf('Length %d overflows data, %d bytes left.',
+					$length->intLength(), strlen($data) - $idx));
+		}
+		$offset = $idx;
+		return $length;
+	}
 
-    /**
-     * @see Encodable::toDER()
-     *
-     * @throws \DomainException If length is too large to encode
-     *
-     * @return string
-     */
-    public function toDER(): string
-    {
-        $bytes = [];
-        if ($this->_indefinite) {
-            $bytes[] = 0x80;
-        } else {
-            $num = $this->_length->gmpObj();
-            // long form
-            if ($num > 127) {
-                $octets = [];
-                for (; $num > 0; $num >>= 8) {
-                    $octets[] = gmp_intval(0xff & $num);
-                }
-                $count = count($octets);
-                // first octet must not be 0xff
-                if ($count >= 127) {
-                    throw new \DomainException('Too many length octets.');
-                }
-                $bytes[] = 0x80 | $count;
-                foreach (array_reverse($octets) as $octet) {
-                    $bytes[] = $octet;
-                }
-            }
-            // short form
-            else {
-                $bytes[] = gmp_intval($num);
-            }
-        }
-        return pack('C*', ...$bytes);
-    }
+	/**
+	 * @see Encodable::toDER()
+	 *
+	 * @throws \DomainException If length is too large to encode
+	 *
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		$bytes = [];
+		if ($this->_indefinite) {
+			$bytes[] = 0x80;
+		} else {
+			$num = $this->_length->gmpObj();
+			// long form
+			if ($num > 127) {
+				$octets = [];
+				for (; $num > 0; $num >>= 8) {
+					$octets[] = gmp_intval(0xff & $num);
+				}
+				$count = count($octets);
+				// first octet must not be 0xff
+				if ($count >= 127) {
+					throw new \DomainException('Too many length octets.');
+				}
+				$bytes[] = 0x80 | $count;
+				foreach (array_reverse($octets) as $octet) {
+					$bytes[] = $octet;
+				}
+			}
+			// short form
+			else {
+				$bytes[] = gmp_intval($num);
+			}
+		}
+		return pack('C*', ...$bytes);
+	}
 
-    /**
-     * Get the length.
-     *
-     * @throws \LogicException If length is indefinite
-     *
-     * @return string Length as an integer string
-     */
-    public function length(): string
-    {
-        if ($this->_indefinite) {
-            throw new \LogicException('Length is indefinite.');
-        }
-        return $this->_length->base10();
-    }
+	/**
+	 * Get the length.
+	 *
+	 * @throws \LogicException If length is indefinite
+	 *
+	 * @return string Length as an integer string
+	 */
+	public function length(): string
+	{
+		if ($this->_indefinite) {
+			throw new \LogicException('Length is indefinite.');
+		}
+		return $this->_length->base10();
+	}
 
-    /**
-     * Get the length as an integer.
-     *
-     * @throws \LogicException   If length is indefinite
-     * @throws \RuntimeException If length overflows integer size
-     *
-     * @return int
-     */
-    public function intLength(): int
-    {
-        if ($this->_indefinite) {
-            throw new \LogicException('Length is indefinite.');
-        }
-        return $this->_length->intVal();
-    }
+	/**
+	 * Get the length as an integer.
+	 *
+	 * @throws \LogicException   If length is indefinite
+	 * @throws \RuntimeException If length overflows integer size
+	 *
+	 * @return int
+	 */
+	public function intLength(): int
+	{
+		if ($this->_indefinite) {
+			throw new \LogicException('Length is indefinite.');
+		}
+		return $this->_length->intVal();
+	}
 
-    /**
-     * Whether length is indefinite.
-     *
-     * @return bool
-     */
-    public function isIndefinite(): bool
-    {
-        return $this->_indefinite;
-    }
+	/**
+	 * Whether length is indefinite.
+	 *
+	 * @return bool
+	 */
+	public function isIndefinite(): bool
+	{
+		return $this->_indefinite;
+	}
 
-    /**
-     * Decode long form length.
-     *
-     * @param int    $length Number of octets
-     * @param string $data   Data
-     * @param int    $offset reference to the variable containing offset to the
-     *                       data
-     *
-     * @throws DecodeException If decoding fails
-     *
-     * @return string Integer as a string
-     */
-    private static function _decodeLongFormLength(int $length, string $data,
-        int &$offset): string
-    {
-        // first octet must not be 0xff (spec 8.1.3.5c)
-        if (127 == $length) {
-            throw new DecodeException('Invalid number of length octets.');
-        }
-        $num = gmp_init(0, 10);
-        while (--$length >= 0) {
-            $byte = ord($data[$offset++]);
-            $num <<= 8;
-            $num |= $byte;
-        }
-        return gmp_strval($num);
-    }
+	/**
+	 * Decode long form length.
+	 *
+	 * @param int    $length Number of octets
+	 * @param string $data   Data
+	 * @param int    $offset reference to the variable containing offset to the
+	 *                       data
+	 *
+	 * @throws DecodeException If decoding fails
+	 *
+	 * @return string Integer as a string
+	 */
+	private static function _decodeLongFormLength(int $length, string $data,
+		int &$offset): string
+	{
+		// first octet must not be 0xff (spec 8.1.3.5c)
+		if (127 == $length) {
+			throw new DecodeException('Invalid number of length octets.');
+		}
+		$num = gmp_init(0, 10);
+		while (--$length >= 0) {
+			$byte = ord($data[$offset++]);
+			$num <<= 8;
+			$num |= $byte;
+		}
+		return gmp_strval($num);
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Exception/DecodeException.php

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Feature/ElementBase.php

Indentation +79 added lines, -79 removed lines

@@ -13,91 +13,91 @@
  */
 interface ElementBase extends Encodable
 {
-    /**
-     * Get the class of the ASN.1 type.
-     *
-     * One of <code>Identifier::CLASS_*</code> constants.
-     *
-     * @return int
-     */
-    public function typeClass(): int;
+	/**
+	 * Get the class of the ASN.1 type.
+	 *
+	 * One of <code>Identifier::CLASS_*</code> constants.
+	 *
+	 * @return int
+	 */
+	public function typeClass(): int;
 
-    /**
-     * Check whether the element is constructed.
-     *
-     * Otherwise it's primitive.
-     *
-     * @return bool
-     */
-    public function isConstructed(): bool;
+	/**
+	 * Check whether the element is constructed.
+	 *
+	 * Otherwise it's primitive.
+	 *
+	 * @return bool
+	 */
+	public function isConstructed(): bool;
 
-    /**
-     * Get the tag of the element.
-     *
-     * Interpretation of the tag depends on the context. For example it may
-     * represent a universal type tag or a tag of an implicitly or explicitly
-     * tagged type.
-     *
-     * @return int
-     */
-    public function tag(): int;
+	/**
+	 * Get the tag of the element.
+	 *
+	 * Interpretation of the tag depends on the context. For example it may
+	 * represent a universal type tag or a tag of an implicitly or explicitly
+	 * tagged type.
+	 *
+	 * @return int
+	 */
+	public function tag(): int;
 
-    /**
-     * Check whether the element is a type of a given tag.
-     *
-     * @param int $tag Type tag
-     *
-     * @return bool
-     */
-    public function isType(int $tag): bool;
+	/**
+	 * Check whether the element is a type of a given tag.
+	 *
+	 * @param int $tag Type tag
+	 *
+	 * @return bool
+	 */
+	public function isType(int $tag): bool;
 
-    /**
-     * Check whether the element is a type of a given tag.
-     *
-     * Throws an exception if expectation fails.
-     *
-     * @param int $tag Type tag
-     *
-     * @throws \UnexpectedValueException If the element type differs from the
-     *                                   expected
-     *
-     * @return ElementBase
-     */
-    public function expectType(int $tag): ElementBase;
+	/**
+	 * Check whether the element is a type of a given tag.
+	 *
+	 * Throws an exception if expectation fails.
+	 *
+	 * @param int $tag Type tag
+	 *
+	 * @throws \UnexpectedValueException If the element type differs from the
+	 *                                   expected
+	 *
+	 * @return ElementBase
+	 */
+	public function expectType(int $tag): ElementBase;
 
-    /**
-     * Check whether the element is tagged (context specific).
-     *
-     * @return bool
-     */
-    public function isTagged(): bool;
+	/**
+	 * Check whether the element is tagged (context specific).
+	 *
+	 * @return bool
+	 */
+	public function isTagged(): bool;
 
-    /**
-     * Check whether the element is tagged (context specific) and optionally has
-     * a given tag.
-     *
-     * Throws an exception if the element is not tagged or tag differs from
-     * the expected.
-     *
-     * @param null|int $tag Optional type tag
-     *
-     * @throws \UnexpectedValueException If expectation fails
-     *
-     * @return TaggedType
-     */
-    public function expectTagged(?int $tag = null): TaggedType;
+	/**
+	 * Check whether the element is tagged (context specific) and optionally has
+	 * a given tag.
+	 *
+	 * Throws an exception if the element is not tagged or tag differs from
+	 * the expected.
+	 *
+	 * @param null|int $tag Optional type tag
+	 *
+	 * @throws \UnexpectedValueException If expectation fails
+	 *
+	 * @return TaggedType
+	 */
+	public function expectTagged(?int $tag = null): TaggedType;
 
-    /**
-     * Get the object as an abstract Element instance.
-     *
-     * @return Element
-     */
-    public function asElement(): Element;
+	/**
+	 * Get the object as an abstract Element instance.
+	 *
+	 * @return Element
+	 */
+	public function asElement(): Element;
 
-    /**
-     * Get the object as an UnspecifiedType instance.
-     *
-     * @return UnspecifiedType
-     */
-    public function asUnspecified(): UnspecifiedType;
+	/**
+	 * Get the object as an UnspecifiedType instance.
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function asUnspecified(): UnspecifiedType;
 }

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Tagged/PrivateType.php

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Tagged/ExplicitlyTaggedType.php

Spacing +1 added lines, -1 removed lines

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

Indentation +36 added lines, -36 removed lines

@@ -16,43 +16,43 @@
  */
 class ExplicitlyTaggedType extends TaggedTypeWrap implements ExplicitTagging
 {
-    /**
-     * Constructor.
-     *
-     * @param int     $tag     Tag number
-     * @param Element $element Wrapped element
-     * @param int     $class   Type class
-     */
-    public function __construct(int $tag, Element $element,
-        int $class = Identifier::CLASS_CONTEXT_SPECIFIC)
-    {
-        $this->_typeTag = $tag;
-        $this->_element = $element;
-        $this->_class = $class;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int     $tag     Tag number
+	 * @param Element $element Wrapped element
+	 * @param int     $class   Type class
+	 */
+	public function __construct(int $tag, Element $element,
+		int $class = Identifier::CLASS_CONTEXT_SPECIFIC)
+	{
+		$this->_typeTag = $tag;
+		$this->_element = $element;
+		$this->_class = $class;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isConstructed(): bool
-    {
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConstructed(): bool
+	{
+		return true;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function explicit(): UnspecifiedType
-    {
-        return $this->_element->asUnspecified();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function explicit(): UnspecifiedType
+	{
+		return $this->_element->asUnspecified();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        // get the full encoding of the wrapped element
-        return $this->_element->toDER();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		// get the full encoding of the wrapped element
+		return $this->_element->toDER();
+	}
 }

lib/ASN1/Type/Tagged/DERTaggedType.php

Spacing +1 added lines, -1 removed lines

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

Indentation +120 added lines, -120 removed lines

@@ -23,135 +23,135 @@
  */
 class DERTaggedType extends TaggedType implements ExplicitTagging, ImplicitTagging
 {
-    /**
-     * Identifier.
-     *
-     * @var Identifier
-     */
-    private $_identifier;
+	/**
+	 * Identifier.
+	 *
+	 * @var Identifier
+	 */
+	private $_identifier;
 
-    /**
-     * DER data.
-     *
-     * @var string
-     */
-    private $_data;
+	/**
+	 * DER data.
+	 *
+	 * @var string
+	 */
+	private $_data;
 
-    /**
-     * Offset to next byte after identifier.
-     *
-     * @var int
-     */
-    private $_offset;
+	/**
+	 * Offset to next byte after identifier.
+	 *
+	 * @var int
+	 */
+	private $_offset;
 
-    /**
-     * Offset to content.
-     *
-     * @var int
-     */
-    private $_valueOffset;
+	/**
+	 * Offset to content.
+	 *
+	 * @var int
+	 */
+	private $_valueOffset;
 
-    /**
-     * Length of the content.
-     *
-     * @var int
-     */
-    private $_valueLength;
+	/**
+	 * Length of the content.
+	 *
+	 * @var int
+	 */
+	private $_valueLength;
 
-    /**
-     * Constructor.
-     *
-     * @param Identifier $identifier   Pre-parsed identifier
-     * @param string     $data         DER data
-     * @param int        $offset       Offset to next byte after identifier
-     * @param int        $value_offset Offset to content
-     * @param int        $value_length Content length
-     */
-    public function __construct(Identifier $identifier, string $data,
-        int $offset, int $value_offset, int $value_length,
-        bool $indefinite_length)
-    {
-        $this->_identifier = $identifier;
-        $this->_data = $data;
-        $this->_offset = $offset;
-        $this->_valueOffset = $value_offset;
-        $this->_valueLength = $value_length;
-        $this->_indefiniteLength = $indefinite_length;
-        $this->_typeTag = $identifier->intTag();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Identifier $identifier   Pre-parsed identifier
+	 * @param string     $data         DER data
+	 * @param int        $offset       Offset to next byte after identifier
+	 * @param int        $value_offset Offset to content
+	 * @param int        $value_length Content length
+	 */
+	public function __construct(Identifier $identifier, string $data,
+		int $offset, int $value_offset, int $value_length,
+		bool $indefinite_length)
+	{
+		$this->_identifier = $identifier;
+		$this->_data = $data;
+		$this->_offset = $offset;
+		$this->_valueOffset = $value_offset;
+		$this->_valueLength = $value_length;
+		$this->_indefiniteLength = $indefinite_length;
+		$this->_typeTag = $identifier->intTag();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function typeClass(): int
-    {
-        return $this->_identifier->typeClass();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function typeClass(): int
+	{
+		return $this->_identifier->typeClass();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isConstructed(): bool
-    {
-        return $this->_identifier->isConstructed();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConstructed(): bool
+	{
+		return $this->_identifier->isConstructed();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
-    {
-        $identifier = $this->_identifier->withClass($class)->withTag($tag);
-        $cls = self::_determineImplClass($identifier);
-        $idx = $this->_offset;
-        /** @var \Sop\ASN1\Feature\ElementBase $element */
-        $element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
-        return $element->asUnspecified();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		$identifier = $this->_identifier->withClass($class)->withTag($tag);
+		$cls = self::_determineImplClass($identifier);
+		$idx = $this->_offset;
+		/** @var \Sop\ASN1\Feature\ElementBase $element */
+		$element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
+		return $element->asUnspecified();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function explicit(): UnspecifiedType
-    {
-        $idx = $this->_valueOffset;
-        return Element::fromDER($this->_data, $idx)->asUnspecified();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function explicit(): UnspecifiedType
+	{
+		$idx = $this->_valueOffset;
+		return Element::fromDER($this->_data, $idx)->asUnspecified();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        // offset to inner value
-        $value_offset = $idx;
-        if ($length->isIndefinite()) {
-            if ($identifier->isPrimitive()) {
-                throw new DecodeException(
-                    'Primitive type with indefinite length is not supported.');
-            }
-            while (!Element::fromDER($data, $idx)->isType(self::TYPE_EOC));
-            // EOC consists of two octets.
-            $value_length = $idx - $value_offset - 2;
-        } else {
-            $value_length = $length->intLength();
-            $idx += $value_length;
-        }
-        // late static binding since ApplicationType and PrivateType extend this class
-        $type = new static($identifier, $data, $offset, $value_offset,
-            $value_length, $length->isIndefinite());
-        $offset = $idx;
-        return $type;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		// offset to inner value
+		$value_offset = $idx;
+		if ($length->isIndefinite()) {
+			if ($identifier->isPrimitive()) {
+				throw new DecodeException(
+					'Primitive type with indefinite length is not supported.');
+			}
+			while (!Element::fromDER($data, $idx)->isType(self::TYPE_EOC));
+			// EOC consists of two octets.
+			$value_length = $idx - $value_offset - 2;
+		} else {
+			$value_length = $length->intLength();
+			$idx += $value_length;
+		}
+		// late static binding since ApplicationType and PrivateType extend this class
+		$type = new static($identifier, $data, $offset, $value_offset,
+			$value_length, $length->isIndefinite());
+		$offset = $idx;
+		return $type;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return substr($this->_data, $this->_valueOffset, $this->_valueLength);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return substr($this->_data, $this->_valueOffset, $this->_valueLength);
+	}
 }

lib/ASN1/Type/Tagged/ContextSpecificType.php

Spacing +1 added lines, -1 removed lines

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