sop / asn1

lib/ASN1/Type/BaseTime.php

Indentation +99 added lines, -99 removed lines

@@ -11,111 +11,111 @@
  */
 abstract class BaseTime extends Element implements TimeType
 {
-    /**
-     * UTC timezone.
-     *
-     * @var string
-     */
-    const TZ_UTC = 'UTC';
+	/**
+	 * UTC timezone.
+	 *
+	 * @var string
+	 */
+	const TZ_UTC = 'UTC';
 
-    /**
-     * Date and time.
-     *
-     * @var \DateTimeImmutable
-     */
-    protected $_dateTime;
+	/**
+	 * Date and time.
+	 *
+	 * @var \DateTimeImmutable
+	 */
+	protected $_dateTime;
 
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_dateTime = $dt;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_dateTime = $dt;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString(): string
-    {
-        return $this->string();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __toString(): string
+	{
+		return $this->string();
+	}
 
-    /**
-     * Initialize from datetime string.
-     *
-     * @see http://php.net/manual/en/datetime.formats.php
-     *
-     * @param string      $time Time string
-     * @param null|string $tz   timezone, if null use default
-     *
-     * @throws \RuntimeException
-     *
-     * @return self
-     */
-    public static function fromString(string $time, ?string $tz = null): self
-    {
-        try {
-            if (!isset($tz)) {
-                $tz = date_default_timezone_get();
-            }
-            return new static(
-                new \DateTimeImmutable($time, self::_createTimeZone($tz)));
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                'Failed to create DateTime: ' .
-                self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
-        }
-    }
+	/**
+	 * Initialize from datetime string.
+	 *
+	 * @see http://php.net/manual/en/datetime.formats.php
+	 *
+	 * @param string      $time Time string
+	 * @param null|string $tz   timezone, if null use default
+	 *
+	 * @throws \RuntimeException
+	 *
+	 * @return self
+	 */
+	public static function fromString(string $time, ?string $tz = null): self
+	{
+		try {
+			if (!isset($tz)) {
+				$tz = date_default_timezone_get();
+			}
+			return new static(
+				new \DateTimeImmutable($time, self::_createTimeZone($tz)));
+		} catch (\Exception $e) {
+			throw new \RuntimeException(
+				'Failed to create DateTime: ' .
+				self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
+		}
+	}
 
-    /**
-     * Get the date and time.
-     *
-     * @return \DateTimeImmutable
-     */
-    public function dateTime(): \DateTimeImmutable
-    {
-        return $this->_dateTime;
-    }
+	/**
+	 * Get the date and time.
+	 *
+	 * @return \DateTimeImmutable
+	 */
+	public function dateTime(): \DateTimeImmutable
+	{
+		return $this->_dateTime;
+	}
 
-    /**
-     * Get the date and time as a type specific string.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_encodedContentDER();
-    }
+	/**
+	 * Get the date and time as a type specific string.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_encodedContentDER();
+	}
 
-    /**
-     * Create `DateTimeZone` object from string.
-     *
-     * @param string $tz
-     *
-     * @throws \UnexpectedValueException If timezone is invalid
-     *
-     * @return \DateTimeZone
-     */
-    protected static function _createTimeZone(string $tz): \DateTimeZone
-    {
-        try {
-            return new \DateTimeZone($tz);
-        } catch (\Exception $e) {
-            throw new \UnexpectedValueException('Invalid timezone.', 0, $e);
-        }
-    }
+	/**
+	 * Create `DateTimeZone` object from string.
+	 *
+	 * @param string $tz
+	 *
+	 * @throws \UnexpectedValueException If timezone is invalid
+	 *
+	 * @return \DateTimeZone
+	 */
+	protected static function _createTimeZone(string $tz): \DateTimeZone
+	{
+		try {
+			return new \DateTimeZone($tz);
+		} catch (\Exception $e) {
+			throw new \UnexpectedValueException('Invalid timezone.', 0, $e);
+		}
+	}
 
-    /**
-     * Get last error caused by `DateTimeImmutable`.
-     *
-     * @return string
-     */
-    protected static function _getLastDateTimeImmutableErrorsStr(): string
-    {
-        $errors = \DateTimeImmutable::getLastErrors()['errors'];
-        return implode(', ', $errors);
-    }
+	/**
+	 * Get last error caused by `DateTimeImmutable`.
+	 *
+	 * @return string
+	 */
+	protected static function _getLastDateTimeImmutableErrorsStr(): string
+	{
+		$errors = \DateTimeImmutable::getLastErrors()['errors'];
+		return implode(', ', $errors);
+	}
 }

lib/ASN1/Type/PrimitiveString.php

Indentation +30 added lines, -30 removed lines

@@ -18,36 +18,36 @@
  */
 abstract class PrimitiveString extends BaseString
 {
-    use PrimitiveType;
+	use PrimitiveType;
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return $this->_string;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return $this->_string;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        if (!$identifier->isPrimitive()) {
-            throw new DecodeException('DER encoded string must be primitive.');
-        }
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $str = $length ? substr($data, $idx, $length) : '';
-        // substr should never return false, since length is
-        // checked by Length::expectFromDER.
-        assert(is_string($str), new DecodeException('substr'));
-        $offset = $idx + $length;
-        try {
-            return new static($str);
-        } catch (\InvalidArgumentException $e) {
-            throw new DecodeException($e->getMessage(), 0, $e);
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		if (!$identifier->isPrimitive()) {
+			throw new DecodeException('DER encoded string must be primitive.');
+		}
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$str = $length ? substr($data, $idx, $length) : '';
+		// substr should never return false, since length is
+		// checked by Length::expectFromDER.
+		assert(is_string($str), new DecodeException('substr'));
+		$offset = $idx + $length;
+		try {
+			return new static($str);
+		} catch (\InvalidArgumentException $e) {
+			throw new DecodeException($e->getMessage(), 0, $e);
+		}
+	}
 }

lib/ASN1/Type/Primitive/UTCTime.php

Indentation +62 added lines, -62 removed lines

@@ -17,70 +17,70 @@
  */
 class UTCTime extends BaseTime
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
 
-    /**
-     * Regular expression to parse date.
-     *
-     * DER restricts format to UTC timezone (Z suffix).
-     *
-     * @var string
-     */
-    const REGEX = '#^' .
-        '(\d\d)' . // YY
-        '(\d\d)' . // MM
-        '(\d\d)' . // DD
-        '(\d\d)' . // hh
-        '(\d\d)' . // mm
-        '(\d\d)' . // ss
-        'Z' . // TZ
-        '$#';
+	/**
+	 * Regular expression to parse date.
+	 *
+	 * DER restricts format to UTC timezone (Z suffix).
+	 *
+	 * @var string
+	 */
+	const REGEX = '#^' .
+		'(\d\d)' . // YY
+		'(\d\d)' . // MM
+		'(\d\d)' . // DD
+		'(\d\d)' . // hh
+		'(\d\d)' . // mm
+		'(\d\d)' . // ss
+		'Z' . // TZ
+		'$#';
 
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_typeTag = self::TYPE_UTC_TIME;
-        parent::__construct($dt);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_typeTag = self::TYPE_UTC_TIME;
+		parent::__construct($dt);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $dt = $this->_dateTime->setTimezone(self::_createTimeZone(self::TZ_UTC));
-        return $dt->format('ymdHis\\Z');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$dt = $this->_dateTime->setTimezone(self::_createTimeZone(self::TZ_UTC));
+		return $dt->format('ymdHis\\Z');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $str = substr($data, $idx, $length);
-        $idx += $length;
-        /** @var string[] $match */
-        if (!preg_match(self::REGEX, $str, $match)) {
-            throw new DecodeException('Invalid UTCTime format.');
-        }
-        [, $year, $month, $day, $hour, $minute, $second] = $match;
-        $time = $year . $month . $day . $hour . $minute . $second . self::TZ_UTC;
-        $dt = \DateTimeImmutable::createFromFormat('!ymdHisT', $time,
-            self::_createTimeZone(self::TZ_UTC));
-        if (!$dt) {
-            throw new DecodeException(
-                'Failed to decode UTCTime: ' .
-                self::_getLastDateTimeImmutableErrorsStr());
-        }
-        $offset = $idx;
-        return new self($dt);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$str = substr($data, $idx, $length);
+		$idx += $length;
+		/** @var string[] $match */
+		if (!preg_match(self::REGEX, $str, $match)) {
+			throw new DecodeException('Invalid UTCTime format.');
+		}
+		[, $year, $month, $day, $hour, $minute, $second] = $match;
+		$time = $year . $month . $day . $hour . $minute . $second . self::TZ_UTC;
+		$dt = \DateTimeImmutable::createFromFormat('!ymdHisT', $time,
+			self::_createTimeZone(self::TZ_UTC));
+		if (!$dt) {
+			throw new DecodeException(
+				'Failed to decode UTCTime: ' .
+				self::_getLastDateTimeImmutableErrorsStr());
+		}
+		$offset = $idx;
+		return new self($dt);
+	}
 }

lib/ASN1/Type/Primitive/CharacterString.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
  */
 class CharacterString extends PrimitiveString
 {
-    use UniversalClass;
+	use UniversalClass;
 
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     */
-    public function __construct(string $string)
-    {
-        $this->_typeTag = self::TYPE_CHARACTER_STRING;
-        parent::__construct($string);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 */
+	public function __construct(string $string)
+	{
+		$this->_typeTag = self::TYPE_CHARACTER_STRING;
+		parent::__construct($string);
+	}
 }

lib/ASN1/Type/Primitive/BitString.php

Indentation +181 added lines, -181 removed lines

@@ -17,194 +17,194 @@
  */
 class BitString extends BaseString
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
 
-    /**
-     * Number of unused bits in the last octet.
-     *
-     * @var int
-     */
-    protected $_unusedBits;
+	/**
+	 * Number of unused bits in the last octet.
+	 *
+	 * @var int
+	 */
+	protected $_unusedBits;
 
-    /**
-     * Constructor.
-     *
-     * @param string $string      Content octets
-     * @param int    $unused_bits Number of unused bits in the last octet
-     */
-    public function __construct(string $string, int $unused_bits = 0)
-    {
-        $this->_typeTag = self::TYPE_BIT_STRING;
-        parent::__construct($string);
-        $this->_unusedBits = $unused_bits;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string      Content octets
+	 * @param int    $unused_bits Number of unused bits in the last octet
+	 */
+	public function __construct(string $string, int $unused_bits = 0)
+	{
+		$this->_typeTag = self::TYPE_BIT_STRING;
+		parent::__construct($string);
+		$this->_unusedBits = $unused_bits;
+	}
 
-    /**
-     * Get the number of bits in the string.
-     *
-     * @return int
-     */
-    public function numBits(): int
-    {
-        return strlen($this->_string) * 8 - $this->_unusedBits;
-    }
+	/**
+	 * Get the number of bits in the string.
+	 *
+	 * @return int
+	 */
+	public function numBits(): int
+	{
+		return strlen($this->_string) * 8 - $this->_unusedBits;
+	}
 
-    /**
-     * Get the number of unused bits in the last octet of the string.
-     *
-     * @return int
-     */
-    public function unusedBits(): int
-    {
-        return $this->_unusedBits;
-    }
+	/**
+	 * Get the number of unused bits in the last octet of the string.
+	 *
+	 * @return int
+	 */
+	public function unusedBits(): int
+	{
+		return $this->_unusedBits;
+	}
 
-    /**
-     * Test whether bit is set.
-     *
-     * @param int $idx Bit index. Most significant bit of the first octet is index 0.
-     *
-     * @return bool
-     */
-    public function testBit(int $idx): bool
-    {
-        // octet index
-        $oi = (int) floor($idx / 8);
-        // if octet is outside range
-        if ($oi < 0 || $oi >= strlen($this->_string)) {
-            throw new \OutOfBoundsException('Index is out of bounds.');
-        }
-        // bit index
-        $bi = $idx % 8;
-        // if tested bit is last octet's unused bit
-        if ($oi === strlen($this->_string) - 1) {
-            if ($bi >= 8 - $this->_unusedBits) {
-                throw new \OutOfBoundsException(
-                    'Index refers to an unused bit.');
-            }
-        }
-        $byte = $this->_string[$oi];
-        // index 0 is the most significant bit in byte
-        $mask = 0x01 << (7 - $bi);
-        return (ord($byte) & $mask) > 0;
-    }
+	/**
+	 * Test whether bit is set.
+	 *
+	 * @param int $idx Bit index. Most significant bit of the first octet is index 0.
+	 *
+	 * @return bool
+	 */
+	public function testBit(int $idx): bool
+	{
+		// octet index
+		$oi = (int) floor($idx / 8);
+		// if octet is outside range
+		if ($oi < 0 || $oi >= strlen($this->_string)) {
+			throw new \OutOfBoundsException('Index is out of bounds.');
+		}
+		// bit index
+		$bi = $idx % 8;
+		// if tested bit is last octet's unused bit
+		if ($oi === strlen($this->_string) - 1) {
+			if ($bi >= 8 - $this->_unusedBits) {
+				throw new \OutOfBoundsException(
+					'Index refers to an unused bit.');
+			}
+		}
+		$byte = $this->_string[$oi];
+		// index 0 is the most significant bit in byte
+		$mask = 0x01 << (7 - $bi);
+		return (ord($byte) & $mask) > 0;
+	}
 
-    /**
-     * Get range of bits.
-     *
-     * @param int $start  Index of first bit
-     * @param int $length Number of bits in range
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return string Integer of $length bits
-     */
-    public function range(int $start, int $length): string
-    {
-        if (!$length) {
-            return '0';
-        }
-        if ($start + $length > $this->numBits()) {
-            throw new \OutOfBoundsException('Not enough bits.');
-        }
-        $bits = gmp_init(0);
-        $idx = $start;
-        $end = $start + $length;
-        while (true) {
-            $bit = $this->testBit($idx) ? 1 : 0;
-            $bits |= $bit;
-            if (++$idx >= $end) {
-                break;
-            }
-            $bits <<= 1;
-        }
-        return gmp_strval($bits, 10);
-    }
+	/**
+	 * Get range of bits.
+	 *
+	 * @param int $start  Index of first bit
+	 * @param int $length Number of bits in range
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return string Integer of $length bits
+	 */
+	public function range(int $start, int $length): string
+	{
+		if (!$length) {
+			return '0';
+		}
+		if ($start + $length > $this->numBits()) {
+			throw new \OutOfBoundsException('Not enough bits.');
+		}
+		$bits = gmp_init(0);
+		$idx = $start;
+		$end = $start + $length;
+		while (true) {
+			$bit = $this->testBit($idx) ? 1 : 0;
+			$bits |= $bit;
+			if (++$idx >= $end) {
+				break;
+			}
+			$bits <<= 1;
+		}
+		return gmp_strval($bits, 10);
+	}
 
-    /**
-     * Get a copy of the bit string with trailing zeroes removed.
-     *
-     * @return self
-     */
-    public function withoutTrailingZeroes(): self
-    {
-        // if bit string was empty
-        if (!strlen($this->_string)) {
-            return new self('');
-        }
-        $bits = $this->_string;
-        // count number of empty trailing octets
-        $unused_octets = 0;
-        for ($idx = strlen($bits) - 1; $idx >= 0; --$idx, ++$unused_octets) {
-            if ("\x0" !== $bits[$idx]) {
-                break;
-            }
-        }
-        // strip trailing octets
-        if ($unused_octets) {
-            $bits = substr($bits, 0, -$unused_octets);
-        }
-        // if bit string was full of zeroes
-        if (!strlen($bits)) {
-            return new self('');
-        }
-        // count number of trailing zeroes in the last octet
-        $unused_bits = 0;
-        $byte = ord($bits[strlen($bits) - 1]);
-        while (!($byte & 0x01)) {
-            ++$unused_bits;
-            $byte >>= 1;
-        }
-        return new self($bits, $unused_bits);
-    }
+	/**
+	 * Get a copy of the bit string with trailing zeroes removed.
+	 *
+	 * @return self
+	 */
+	public function withoutTrailingZeroes(): self
+	{
+		// if bit string was empty
+		if (!strlen($this->_string)) {
+			return new self('');
+		}
+		$bits = $this->_string;
+		// count number of empty trailing octets
+		$unused_octets = 0;
+		for ($idx = strlen($bits) - 1; $idx >= 0; --$idx, ++$unused_octets) {
+			if ("\x0" !== $bits[$idx]) {
+				break;
+			}
+		}
+		// strip trailing octets
+		if ($unused_octets) {
+			$bits = substr($bits, 0, -$unused_octets);
+		}
+		// if bit string was full of zeroes
+		if (!strlen($bits)) {
+			return new self('');
+		}
+		// count number of trailing zeroes in the last octet
+		$unused_bits = 0;
+		$byte = ord($bits[strlen($bits) - 1]);
+		while (!($byte & 0x01)) {
+			++$unused_bits;
+			$byte >>= 1;
+		}
+		return new self($bits, $unused_bits);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $der = chr($this->_unusedBits);
-        $der .= $this->_string;
-        if ($this->_unusedBits) {
-            $octet = $der[strlen($der) - 1];
-            // set unused bits to zero
-            $octet &= chr(0xff & ~((1 << $this->_unusedBits) - 1));
-            $der[strlen($der) - 1] = $octet;
-        }
-        return $der;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$der = chr($this->_unusedBits);
+		$der .= $this->_string;
+		if ($this->_unusedBits) {
+			$octet = $der[strlen($der) - 1];
+			// set unused bits to zero
+			$octet &= chr(0xff & ~((1 << $this->_unusedBits) - 1));
+			$der[strlen($der) - 1] = $octet;
+		}
+		return $der;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        if ($length->intLength() < 1) {
-            throw new DecodeException('Bit string length must be at least 1.');
-        }
-        $unused_bits = ord($data[$idx++]);
-        if ($unused_bits > 7) {
-            throw new DecodeException(
-                'Unused bits in a bit string must be less than 8.');
-        }
-        $str_len = $length->intLength() - 1;
-        if ($str_len) {
-            $str = substr($data, $idx, $str_len);
-            if ($unused_bits) {
-                $mask = (1 << $unused_bits) - 1;
-                if (ord($str[strlen($str) - 1]) & $mask) {
-                    throw new DecodeException(
-                        'DER encoded bit string must have zero padding.');
-                }
-            }
-        } else {
-            $str = '';
-        }
-        $offset = $idx + $str_len;
-        return new self($str, $unused_bits);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		if ($length->intLength() < 1) {
+			throw new DecodeException('Bit string length must be at least 1.');
+		}
+		$unused_bits = ord($data[$idx++]);
+		if ($unused_bits > 7) {
+			throw new DecodeException(
+				'Unused bits in a bit string must be less than 8.');
+		}
+		$str_len = $length->intLength() - 1;
+		if ($str_len) {
+			$str = substr($data, $idx, $str_len);
+			if ($unused_bits) {
+				$mask = (1 << $unused_bits) - 1;
+				if (ord($str[strlen($str) - 1]) & $mask) {
+					throw new DecodeException(
+						'DER encoded bit string must have zero padding.');
+				}
+			}
+		} else {
+			$str = '';
+		}
+		$offset = $idx + $str_len;
+		return new self($str, $unused_bits);
+	}
 }

lib/ASN1/Type/Primitive/GeneralizedTime.php

Indentation +101 added lines, -101 removed lines

@@ -17,111 +17,111 @@
  */
 class GeneralizedTime extends BaseTime
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
 
-    /**
-     * Regular expression to parse date.
-     *
-     * DER restricts format to UTC timezone (Z suffix).
-     *
-     * @var string
-     */
-    const REGEX = '#^' .
-        '(\d\d\d\d)' . // YYYY
-        '(\d\d)' . // MM
-        '(\d\d)' . // DD
-        '(\d\d)' . // hh
-        '(\d\d)' . // mm
-        '(\d\d)' . // ss
-        '(?:\.(\d+))?' . // frac
-        'Z' . // TZ
-        '$#';
+	/**
+	 * Regular expression to parse date.
+	 *
+	 * DER restricts format to UTC timezone (Z suffix).
+	 *
+	 * @var string
+	 */
+	const REGEX = '#^' .
+		'(\d\d\d\d)' . // YYYY
+		'(\d\d)' . // MM
+		'(\d\d)' . // DD
+		'(\d\d)' . // hh
+		'(\d\d)' . // mm
+		'(\d\d)' . // ss
+		'(?:\.(\d+))?' . // frac
+		'Z' . // TZ
+		'$#';
 
-    /**
-     * Cached formatted date.
-     *
-     * @var null|string
-     */
-    private $_formatted;
+	/**
+	 * Cached formatted date.
+	 *
+	 * @var null|string
+	 */
+	private $_formatted;
 
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_typeTag = self::TYPE_GENERALIZED_TIME;
-        parent::__construct($dt);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_typeTag = self::TYPE_GENERALIZED_TIME;
+		parent::__construct($dt);
+	}
 
-    /**
-     * Clear cached variables on clone.
-     */
-    public function __clone()
-    {
-        $this->_formatted = null;
-    }
+	/**
+	 * Clear cached variables on clone.
+	 */
+	public function __clone()
+	{
+		$this->_formatted = null;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        if (!isset($this->_formatted)) {
-            $dt = $this->_dateTime->setTimezone(
-                self::_createTimeZone(self::TZ_UTC));
-            $this->_formatted = $dt->format('YmdHis');
-            // if fractions were used
-            $frac = $dt->format('u');
-            if (0 !== intval($frac)) {
-                $frac = rtrim($frac, '0');
-                $this->_formatted .= ".{$frac}";
-            }
-            // timezone
-            $this->_formatted .= 'Z';
-        }
-        return $this->_formatted;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		if (!isset($this->_formatted)) {
+			$dt = $this->_dateTime->setTimezone(
+				self::_createTimeZone(self::TZ_UTC));
+			$this->_formatted = $dt->format('YmdHis');
+			// if fractions were used
+			$frac = $dt->format('u');
+			if (0 !== intval($frac)) {
+				$frac = rtrim($frac, '0');
+				$this->_formatted .= ".{$frac}";
+			}
+			// timezone
+			$this->_formatted .= 'Z';
+		}
+		return $this->_formatted;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $str = substr($data, $idx, $length);
-        $idx += $length;
-        /** @var string[] $match */
-        if (!preg_match(self::REGEX, $str, $match)) {
-            throw new DecodeException('Invalid GeneralizedTime format.');
-        }
-        [, $year, $month, $day, $hour, $minute, $second] = $match;
-        // if fractions match, there's at least one digit
-        if (isset($match[7])) {
-            $frac = $match[7];
-            // DER restricts trailing zeroes in fractional seconds component
-            if ('0' === $frac[strlen($frac) - 1]) {
-                throw new DecodeException(
-                    'Fractional seconds must omit trailing zeroes.');
-            }
-            $frac = $frac;
-        } else {
-            $frac = '0';
-        }
-        $time = $year . $month . $day . $hour . $minute . $second . '.' . $frac .
-            self::TZ_UTC;
-        $dt = \DateTimeImmutable::createFromFormat('!YmdHis.uT', $time,
-            self::_createTimeZone(self::TZ_UTC));
-        if (!$dt) {
-            throw new DecodeException(
-                'Failed to decode GeneralizedTime: ' .
-                self::_getLastDateTimeImmutableErrorsStr());
-        }
-        $offset = $idx;
-        return new self($dt);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$str = substr($data, $idx, $length);
+		$idx += $length;
+		/** @var string[] $match */
+		if (!preg_match(self::REGEX, $str, $match)) {
+			throw new DecodeException('Invalid GeneralizedTime format.');
+		}
+		[, $year, $month, $day, $hour, $minute, $second] = $match;
+		// if fractions match, there's at least one digit
+		if (isset($match[7])) {
+			$frac = $match[7];
+			// DER restricts trailing zeroes in fractional seconds component
+			if ('0' === $frac[strlen($frac) - 1]) {
+				throw new DecodeException(
+					'Fractional seconds must omit trailing zeroes.');
+			}
+			$frac = $frac;
+		} else {
+			$frac = '0';
+		}
+		$time = $year . $month . $day . $hour . $minute . $second . '.' . $frac .
+			self::TZ_UTC;
+		$dt = \DateTimeImmutable::createFromFormat('!YmdHis.uT', $time,
+			self::_createTimeZone(self::TZ_UTC));
+		if (!$dt) {
+			throw new DecodeException(
+				'Failed to decode GeneralizedTime: ' .
+				self::_getLastDateTimeImmutableErrorsStr());
+		}
+		$offset = $idx;
+		return new self($dt);
+	}
 }

lib/ASN1/Type/Structure.php

Indentation +373 added lines, -373 removed lines

@@ -15,400 +15,400 @@
  */
 abstract class Structure extends Element implements \Countable, \IteratorAggregate
 {
-    use UniversalClass;
+	use UniversalClass;
 
-    /**
-     * Array of elements in the structure.
-     *
-     * @var Element[]
-     */
-    protected $_elements;
+	/**
+	 * Array of elements in the structure.
+	 *
+	 * @var Element[]
+	 */
+	protected $_elements;
 
-    /**
-     * Lookup table for the tagged elements.
-     *
-     * @var null|TaggedType[]
-     */
-    private $_taggedMap;
+	/**
+	 * Lookup table for the tagged elements.
+	 *
+	 * @var null|TaggedType[]
+	 */
+	private $_taggedMap;
 
-    /**
-     * Cache variable of elements wrapped into `UnspecifiedType` objects.
-     *
-     * @var null|UnspecifiedType[]
-     */
-    private $_unspecifiedTypes;
+	/**
+	 * Cache variable of elements wrapped into `UnspecifiedType` objects.
+	 *
+	 * @var null|UnspecifiedType[]
+	 */
+	private $_unspecifiedTypes;
 
-    /**
-     * Constructor.
-     *
-     * @param ElementBase ...$elements Any number of elements
-     */
-    public function __construct(ElementBase ...$elements)
-    {
-        $this->_elements = array_map(
-            function (ElementBase $el) {
-                return $el->asElement();
-            }, $elements);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param ElementBase ...$elements Any number of elements
+	 */
+	public function __construct(ElementBase ...$elements)
+	{
+		$this->_elements = array_map(
+			function (ElementBase $el) {
+				return $el->asElement();
+			}, $elements);
+	}
 
-    /**
-     * Clone magic method.
-     */
-    public function __clone()
-    {
-        // clear cache-variables
-        $this->_taggedMap = null;
-        $this->_unspecifiedTypes = null;
-    }
+	/**
+	 * Clone magic method.
+	 */
+	public function __clone()
+	{
+		// clear cache-variables
+		$this->_taggedMap = null;
+		$this->_unspecifiedTypes = null;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isConstructed(): bool
-    {
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConstructed(): bool
+	{
+		return true;
+	}
 
-    /**
-     * Explode DER structure to DER encoded components that it contains.
-     *
-     * @param string $data
-     *
-     * @throws DecodeException
-     *
-     * @return string[]
-     */
-    public static function explodeDER(string $data): array
-    {
-        $offset = 0;
-        $identifier = Identifier::fromDER($data, $offset);
-        if (!$identifier->isConstructed()) {
-            throw new DecodeException('Element is not constructed.');
-        }
-        $length = Length::expectFromDER($data, $offset);
-        if ($length->isIndefinite()) {
-            throw new DecodeException(
-                'Explode not implemented for indefinite length encoding.');
-        }
-        $end = $offset + $length->intLength();
-        $parts = [];
-        while ($offset < $end) {
-            // start of the element
-            $idx = $offset;
-            // skip identifier
-            Identifier::fromDER($data, $offset);
-            // decode element length
-            $length = Length::expectFromDER($data, $offset)->intLength();
-            // extract der encoding of the element
-            $parts[] = substr($data, $idx, $offset - $idx + $length);
-            // update offset over content
-            $offset += $length;
-        }
-        return $parts;
-    }
+	/**
+	 * Explode DER structure to DER encoded components that it contains.
+	 *
+	 * @param string $data
+	 *
+	 * @throws DecodeException
+	 *
+	 * @return string[]
+	 */
+	public static function explodeDER(string $data): array
+	{
+		$offset = 0;
+		$identifier = Identifier::fromDER($data, $offset);
+		if (!$identifier->isConstructed()) {
+			throw new DecodeException('Element is not constructed.');
+		}
+		$length = Length::expectFromDER($data, $offset);
+		if ($length->isIndefinite()) {
+			throw new DecodeException(
+				'Explode not implemented for indefinite length encoding.');
+		}
+		$end = $offset + $length->intLength();
+		$parts = [];
+		while ($offset < $end) {
+			// start of the element
+			$idx = $offset;
+			// skip identifier
+			Identifier::fromDER($data, $offset);
+			// decode element length
+			$length = Length::expectFromDER($data, $offset)->intLength();
+			// extract der encoding of the element
+			$parts[] = substr($data, $idx, $offset - $idx + $length);
+			// update offset over content
+			$offset += $length;
+		}
+		return $parts;
+	}
 
-    /**
-     * Get self with an element at the given index replaced by another.
-     *
-     * @param int     $idx Element index
-     * @param Element $el  New element to insert into the structure
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return self
-     */
-    public function withReplaced(int $idx, Element $el): self
-    {
-        if (!isset($this->_elements[$idx])) {
-            throw new \OutOfBoundsException(
-                "Structure doesn't have element at index {$idx}.");
-        }
-        $obj = clone $this;
-        $obj->_elements[$idx] = $el;
-        return $obj;
-    }
+	/**
+	 * Get self with an element at the given index replaced by another.
+	 *
+	 * @param int     $idx Element index
+	 * @param Element $el  New element to insert into the structure
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return self
+	 */
+	public function withReplaced(int $idx, Element $el): self
+	{
+		if (!isset($this->_elements[$idx])) {
+			throw new \OutOfBoundsException(
+				"Structure doesn't have element at index {$idx}.");
+		}
+		$obj = clone $this;
+		$obj->_elements[$idx] = $el;
+		return $obj;
+	}
 
-    /**
-     * Get self with an element inserted before the given index.
-     *
-     * @param int     $idx Element index
-     * @param Element $el  New element to insert into the structure
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return self
-     */
-    public function withInserted(int $idx, Element $el): self
-    {
-        if (count($this->_elements) < $idx || $idx < 0) {
-            throw new \OutOfBoundsException("Index {$idx} is out of bounds.");
-        }
-        $obj = clone $this;
-        array_splice($obj->_elements, $idx, 0, [$el]);
-        return $obj;
-    }
+	/**
+	 * Get self with an element inserted before the given index.
+	 *
+	 * @param int     $idx Element index
+	 * @param Element $el  New element to insert into the structure
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return self
+	 */
+	public function withInserted(int $idx, Element $el): self
+	{
+		if (count($this->_elements) < $idx || $idx < 0) {
+			throw new \OutOfBoundsException("Index {$idx} is out of bounds.");
+		}
+		$obj = clone $this;
+		array_splice($obj->_elements, $idx, 0, [$el]);
+		return $obj;
+	}
 
-    /**
-     * Get self with an element appended to the end.
-     *
-     * @param Element $el Element to insert into the structure
-     *
-     * @return self
-     */
-    public function withAppended(Element $el): self
-    {
-        $obj = clone $this;
-        array_push($obj->_elements, $el);
-        return $obj;
-    }
+	/**
+	 * Get self with an element appended to the end.
+	 *
+	 * @param Element $el Element to insert into the structure
+	 *
+	 * @return self
+	 */
+	public function withAppended(Element $el): self
+	{
+		$obj = clone $this;
+		array_push($obj->_elements, $el);
+		return $obj;
+	}
 
-    /**
-     * Get self with an element prepended in the beginning.
-     *
-     * @param Element $el Element to insert into the structure
-     *
-     * @return self
-     */
-    public function withPrepended(Element $el): self
-    {
-        $obj = clone $this;
-        array_unshift($obj->_elements, $el);
-        return $obj;
-    }
+	/**
+	 * Get self with an element prepended in the beginning.
+	 *
+	 * @param Element $el Element to insert into the structure
+	 *
+	 * @return self
+	 */
+	public function withPrepended(Element $el): self
+	{
+		$obj = clone $this;
+		array_unshift($obj->_elements, $el);
+		return $obj;
+	}
 
-    /**
-     * Get self with an element at the given index removed.
-     *
-     * @param int $idx Element index
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return self
-     */
-    public function withoutElement(int $idx): self
-    {
-        if (!isset($this->_elements[$idx])) {
-            throw new \OutOfBoundsException(
-                "Structure doesn't have element at index {$idx}.");
-        }
-        $obj = clone $this;
-        array_splice($obj->_elements, $idx, 1);
-        return $obj;
-    }
+	/**
+	 * Get self with an element at the given index removed.
+	 *
+	 * @param int $idx Element index
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return self
+	 */
+	public function withoutElement(int $idx): self
+	{
+		if (!isset($this->_elements[$idx])) {
+			throw new \OutOfBoundsException(
+				"Structure doesn't have element at index {$idx}.");
+		}
+		$obj = clone $this;
+		array_splice($obj->_elements, $idx, 1);
+		return $obj;
+	}
 
-    /**
-     * Get elements in the structure.
-     *
-     * @return UnspecifiedType[]
-     */
-    public function elements(): array
-    {
-        if (!isset($this->_unspecifiedTypes)) {
-            $this->_unspecifiedTypes = array_map(
-                function (Element $el) {
-                    return new UnspecifiedType($el);
-                }, $this->_elements);
-        }
-        return $this->_unspecifiedTypes;
-    }
+	/**
+	 * Get elements in the structure.
+	 *
+	 * @return UnspecifiedType[]
+	 */
+	public function elements(): array
+	{
+		if (!isset($this->_unspecifiedTypes)) {
+			$this->_unspecifiedTypes = array_map(
+				function (Element $el) {
+					return new UnspecifiedType($el);
+				}, $this->_elements);
+		}
+		return $this->_unspecifiedTypes;
+	}
 
-    /**
-     * Check whether the structure has an element at the given index, optionally
-     * satisfying given tag expectation.
-     *
-     * @param int      $idx         Index 0..n
-     * @param null|int $expectedTag Optional type tag expectation
-     *
-     * @return bool
-     */
-    public function has(int $idx, ?int $expectedTag = null): bool
-    {
-        if (!isset($this->_elements[$idx])) {
-            return false;
-        }
-        if (isset($expectedTag)) {
-            if (!$this->_elements[$idx]->isType($expectedTag)) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Check whether the structure has an element at the given index, optionally
+	 * satisfying given tag expectation.
+	 *
+	 * @param int      $idx         Index 0..n
+	 * @param null|int $expectedTag Optional type tag expectation
+	 *
+	 * @return bool
+	 */
+	public function has(int $idx, ?int $expectedTag = null): bool
+	{
+		if (!isset($this->_elements[$idx])) {
+			return false;
+		}
+		if (isset($expectedTag)) {
+			if (!$this->_elements[$idx]->isType($expectedTag)) {
+				return false;
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Get the element at the given index, optionally checking that the element
-     * has a given tag.
-     *
-     * @param int $idx Index 0..n
-     *
-     * @throws \OutOfBoundsException     If element doesn't exists
-     * @throws \UnexpectedValueException If expectation fails
-     *
-     * @return UnspecifiedType
-     */
-    public function at(int $idx): UnspecifiedType
-    {
-        if (!isset($this->_elements[$idx])) {
-            throw new \OutOfBoundsException(
-                "Structure doesn't have an element at index {$idx}.");
-        }
-        return new UnspecifiedType($this->_elements[$idx]);
-    }
+	/**
+	 * Get the element at the given index, optionally checking that the element
+	 * has a given tag.
+	 *
+	 * @param int $idx Index 0..n
+	 *
+	 * @throws \OutOfBoundsException     If element doesn't exists
+	 * @throws \UnexpectedValueException If expectation fails
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function at(int $idx): UnspecifiedType
+	{
+		if (!isset($this->_elements[$idx])) {
+			throw new \OutOfBoundsException(
+				"Structure doesn't have an element at index {$idx}.");
+		}
+		return new UnspecifiedType($this->_elements[$idx]);
+	}
 
-    /**
-     * Check whether the structure contains a context specific element with a
-     * given tag.
-     *
-     * @param int $tag Tag number
-     *
-     * @return bool
-     */
-    public function hasTagged(int $tag): bool
-    {
-        // lazily build lookup map
-        if (!isset($this->_taggedMap)) {
-            $this->_taggedMap = [];
-            foreach ($this->_elements as $element) {
-                if ($element->isTagged()) {
-                    $this->_taggedMap[$element->tag()] = $element;
-                }
-            }
-        }
-        return isset($this->_taggedMap[$tag]);
-    }
+	/**
+	 * Check whether the structure contains a context specific element with a
+	 * given tag.
+	 *
+	 * @param int $tag Tag number
+	 *
+	 * @return bool
+	 */
+	public function hasTagged(int $tag): bool
+	{
+		// lazily build lookup map
+		if (!isset($this->_taggedMap)) {
+			$this->_taggedMap = [];
+			foreach ($this->_elements as $element) {
+				if ($element->isTagged()) {
+					$this->_taggedMap[$element->tag()] = $element;
+				}
+			}
+		}
+		return isset($this->_taggedMap[$tag]);
+	}
 
-    /**
-     * Get a context specific element tagged with a given tag.
-     *
-     * @param int $tag
-     *
-     * @throws \LogicException If tag doesn't exists
-     *
-     * @return TaggedType
-     */
-    public function getTagged(int $tag): TaggedType
-    {
-        if (!$this->hasTagged($tag)) {
-            throw new \LogicException("No tagged element for tag {$tag}.");
-        }
-        return $this->_taggedMap[$tag];
-    }
+	/**
+	 * Get a context specific element tagged with a given tag.
+	 *
+	 * @param int $tag
+	 *
+	 * @throws \LogicException If tag doesn't exists
+	 *
+	 * @return TaggedType
+	 */
+	public function getTagged(int $tag): TaggedType
+	{
+		if (!$this->hasTagged($tag)) {
+			throw new \LogicException("No tagged element for tag {$tag}.");
+		}
+		return $this->_taggedMap[$tag];
+	}
 
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_elements);
-    }
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_elements);
+	}
 
-    /**
-     * Get an iterator for the `UnspecifiedElement` objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->elements());
-    }
+	/**
+	 * Get an iterator for the `UnspecifiedElement` objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->elements());
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $data = '';
-        foreach ($this->_elements as $element) {
-            $data .= $element->toDER();
-        }
-        return $data;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$data = '';
+		foreach ($this->_elements as $element) {
+			$data .= $element->toDER();
+		}
+		return $data;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        if (!$identifier->isConstructed()) {
-            throw new DecodeException(
-                'Structured element must have constructed bit set.');
-        }
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        if ($length->isIndefinite()) {
-            $type = self::_decodeIndefiniteLength($data, $idx);
-        } else {
-            $type = self::_decodeDefiniteLength($data, $idx,
-                $length->intLength());
-        }
-        $offset = $idx;
-        return $type;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		if (!$identifier->isConstructed()) {
+			throw new DecodeException(
+				'Structured element must have constructed bit set.');
+		}
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		if ($length->isIndefinite()) {
+			$type = self::_decodeIndefiniteLength($data, $idx);
+		} else {
+			$type = self::_decodeDefiniteLength($data, $idx,
+				$length->intLength());
+		}
+		$offset = $idx;
+		return $type;
+	}
 
-    /**
-     * Decode elements for a definite length.
-     *
-     * @param string $data   DER data
-     * @param int    $offset Offset to data
-     * @param int    $length Number of bytes to decode
-     *
-     * @throws DecodeException
-     *
-     * @return ElementBase
-     */
-    private static function _decodeDefiniteLength(string $data, int &$offset,
-        int $length): ElementBase
-    {
-        $idx = $offset;
-        $end = $idx + $length;
-        $elements = [];
-        while ($idx < $end) {
-            $elements[] = Element::fromDER($data, $idx);
-            // check that element didn't overflow length
-            if ($idx > $end) {
-                throw new DecodeException("Structure's content overflows length.");
-            }
-        }
-        $offset = $idx;
-        // return instance by static late binding
-        return new static(...$elements);
-    }
+	/**
+	 * Decode elements for a definite length.
+	 *
+	 * @param string $data   DER data
+	 * @param int    $offset Offset to data
+	 * @param int    $length Number of bytes to decode
+	 *
+	 * @throws DecodeException
+	 *
+	 * @return ElementBase
+	 */
+	private static function _decodeDefiniteLength(string $data, int &$offset,
+		int $length): ElementBase
+	{
+		$idx = $offset;
+		$end = $idx + $length;
+		$elements = [];
+		while ($idx < $end) {
+			$elements[] = Element::fromDER($data, $idx);
+			// check that element didn't overflow length
+			if ($idx > $end) {
+				throw new DecodeException("Structure's content overflows length.");
+			}
+		}
+		$offset = $idx;
+		// return instance by static late binding
+		return new static(...$elements);
+	}
 
-    /**
-     * Decode elements for an indefinite length.
-     *
-     * @param string $data   DER data
-     * @param int    $offset Offset to data
-     *
-     * @throws DecodeException
-     *
-     * @return ElementBase
-     */
-    private static function _decodeIndefiniteLength(string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $elements = [];
-        $end = strlen($data);
-        while (true) {
-            if ($idx >= $end) {
-                throw new DecodeException(
-                    'Unexpected end of data while decoding indefinite length structure.');
-            }
-            $el = Element::fromDER($data, $idx);
-            if ($el->isType(self::TYPE_EOC)) {
-                break;
-            }
-            $elements[] = $el;
-        }
-        $offset = $idx;
-        $type = new static(...$elements);
-        $type->_indefiniteLength = true;
-        return $type;
-    }
+	/**
+	 * Decode elements for an indefinite length.
+	 *
+	 * @param string $data   DER data
+	 * @param int    $offset Offset to data
+	 *
+	 * @throws DecodeException
+	 *
+	 * @return ElementBase
+	 */
+	private static function _decodeIndefiniteLength(string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$elements = [];
+		$end = strlen($data);
+		while (true) {
+			if ($idx >= $end) {
+				throw new DecodeException(
+					'Unexpected end of data while decoding indefinite length structure.');
+			}
+			$el = Element::fromDER($data, $idx);
+			if ($el->isType(self::TYPE_EOC)) {
+				break;
+			}
+			$elements[] = $el;
+		}
+		$offset = $idx;
+		$type = new static(...$elements);
+		$type->_indefiniteLength = true;
+		return $type;
+	}
 }

lib/ASN1/Feature/ElementBase.php

Indentation +78 added lines, -78 removed lines

@@ -13,90 +13,90 @@
  */
 interface ElementBase extends Encodable
 {
-    /**
-     * Get the class of the ASN.1 type.
-     *
-     * One of `Identifier::CLASS_*` constants.
-     *
-     * @return int
-     */
-    public function typeClass(): int;
+	/**
+	 * Get the class of the ASN.1 type.
+	 *
+	 * One of `Identifier::CLASS_*` 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;
 }

lib/ASN1/Component/Length.php

Indentation +210 added lines, -210 removed lines

@@ -13,223 +13,223 @@
  */
 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;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \DomainException If length is too large to encode
-     */
-    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);
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws \DomainException If length is too large to encode
+	 */
+	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);
+	}
 }