sop / asn1

lib/ASN1/Type/Primitive/VideotexString.php

Indentation +19 added lines, -19 removed lines

@@ -12,25 +12,25 @@
  */
 class VideotexString extends PrimitiveString
 {
-    use UniversalClass;
+	use UniversalClass;
 
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     */
-    public function __construct(string $string)
-    {
-        $this->_typeTag = self::TYPE_VIDEOTEX_STRING;
-        parent::__construct($string);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 */
+	public function __construct(string $string)
+	{
+		$this->_typeTag = self::TYPE_VIDEOTEX_STRING;
+		parent::__construct($string);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _validateString(string $string): bool
-    {
-        // allow everything
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _validateString(string $string): bool
+	{
+		// allow everything
+		return true;
+	}
 }

lib/ASN1/Type/Primitive/BMPString.php

Indentation +22 added lines, -22 removed lines

@@ -15,28 +15,28 @@
  */
 class BMPString extends PrimitiveString
 {
-    use UniversalClass;
+	use UniversalClass;
 
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     */
-    public function __construct(string $string)
-    {
-        $this->_typeTag = self::TYPE_BMP_STRING;
-        parent::__construct($string);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 */
+	public function __construct(string $string)
+	{
+		$this->_typeTag = self::TYPE_BMP_STRING;
+		parent::__construct($string);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _validateString(string $string): bool
-    {
-        // UCS-2 has fixed with of 2 octets (16 bits)
-        if (0 !== strlen($string) % 2) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _validateString(string $string): bool
+	{
+		// UCS-2 has fixed with of 2 octets (16 bits)
+		if (0 !== strlen($string) % 2) {
+			return false;
+		}
+		return true;
+	}
 }

lib/ASN1/Type/Primitive/RelativeOID.php

Indentation +30 added lines, -30 removed lines

@@ -13,36 +13,36 @@
  */
 class RelativeOID extends ObjectIdentifier
 {
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-        $this->_subids = self::_explodeDottedOID($oid);
-        $this->_typeTag = self::TYPE_RELATIVE_OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+		$this->_subids = self::_explodeDottedOID($oid);
+		$this->_typeTag = self::TYPE_RELATIVE_OID;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return self::_encodeSubIDs(...$this->_subids);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return self::_encodeSubIDs(...$this->_subids);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $len = Length::expectFromDER($data, $idx)->intLength();
-        $subids = self::_decodeSubIDs(substr($data, $idx, $len));
-        $offset = $idx + $len;
-        return new self(self::_implodeSubIDs(...$subids));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$len = Length::expectFromDER($data, $idx)->intLength();
+		$subids = self::_decodeSubIDs(substr($data, $idx, $len));
+		$offset = $idx + $len;
+		return new self(self::_implodeSubIDs(...$subids));
+	}
 }

lib/ASN1/Type/Primitive/GraphicString.php

Indentation +19 added lines, -19 removed lines

@@ -12,25 +12,25 @@
  */
 class GraphicString extends PrimitiveString
 {
-    use UniversalClass;
+	use UniversalClass;
 
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     */
-    public function __construct(string $string)
-    {
-        $this->_typeTag = self::TYPE_GRAPHIC_STRING;
-        parent::__construct($string);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 */
+	public function __construct(string $string)
+	{
+		$this->_typeTag = self::TYPE_GRAPHIC_STRING;
+		parent::__construct($string);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _validateString(string $string): bool
-    {
-        // allow everything
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _validateString(string $string): bool
+	{
+		// allow everything
+		return true;
+	}
 }

lib/ASN1/Type/PrimitiveType.php

Indentation +9 added lines, -9 removed lines

@@ -9,13 +9,13 @@
  */
 trait PrimitiveType
 {
-    /**
-     * @see \Sop\ASN1\Feature\ElementBase::isConstructed()
-     *
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return false;
-    }
+	/**
+	 * @see \Sop\ASN1\Feature\ElementBase::isConstructed()
+	 *
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return false;
+	}
 }

lib/ASN1/Type/TaggedType.php

Indentation +72 added lines, -72 removed lines

@@ -14,79 +14,79 @@
  */
 abstract class TaggedType extends Element
 {
-    /**
-     * Check whether element supports explicit tagging.
-     *
-     * @param null|int $expectedTag Optional outer tag expectation
-     *
-     * @throws \UnexpectedValueException If expectation fails
-     *
-     * @return ExplicitTagging
-     */
-    public function expectExplicit(?int $expectedTag = null): ExplicitTagging
-    {
-        $el = $this;
-        if (!$el instanceof ExplicitTagging) {
-            throw new \UnexpectedValueException(
-                "Element doesn't implement explicit tagging.");
-        }
-        if (isset($expectedTag)) {
-            $el->expectTagged($expectedTag);
-        }
-        return $el;
-    }
+	/**
+	 * Check whether element supports explicit tagging.
+	 *
+	 * @param null|int $expectedTag Optional outer tag expectation
+	 *
+	 * @throws \UnexpectedValueException If expectation fails
+	 *
+	 * @return ExplicitTagging
+	 */
+	public function expectExplicit(?int $expectedTag = null): ExplicitTagging
+	{
+		$el = $this;
+		if (!$el instanceof ExplicitTagging) {
+			throw new \UnexpectedValueException(
+				"Element doesn't implement explicit tagging.");
+		}
+		if (isset($expectedTag)) {
+			$el->expectTagged($expectedTag);
+		}
+		return $el;
+	}
 
-    /**
-     * Get the wrapped inner element employing explicit tagging.
-     *
-     * @param null|int $expectedTag Optional outer tag expectation
-     *
-     * @throws \UnexpectedValueException If expectation fails
-     *
-     * @return UnspecifiedType
-     */
-    public function asExplicit(?int $expectedTag = null): UnspecifiedType
-    {
-        return $this->expectExplicit($expectedTag)->explicit();
-    }
+	/**
+	 * Get the wrapped inner element employing explicit tagging.
+	 *
+	 * @param null|int $expectedTag Optional outer tag expectation
+	 *
+	 * @throws \UnexpectedValueException If expectation fails
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function asExplicit(?int $expectedTag = null): UnspecifiedType
+	{
+		return $this->expectExplicit($expectedTag)->explicit();
+	}
 
-    /**
-     * Check whether element supports implicit tagging.
-     *
-     * @param null|int $expectedTag Optional outer tag expectation
-     *
-     * @throws \UnexpectedValueException If expectation fails
-     *
-     * @return ImplicitTagging
-     */
-    public function expectImplicit(?int $expectedTag = null): ImplicitTagging
-    {
-        $el = $this;
-        if (!$el instanceof ImplicitTagging) {
-            throw new \UnexpectedValueException(
-                "Element doesn't implement implicit tagging.");
-        }
-        if (isset($expectedTag)) {
-            $el->expectTagged($expectedTag);
-        }
-        return $el;
-    }
+	/**
+	 * Check whether element supports implicit tagging.
+	 *
+	 * @param null|int $expectedTag Optional outer tag expectation
+	 *
+	 * @throws \UnexpectedValueException If expectation fails
+	 *
+	 * @return ImplicitTagging
+	 */
+	public function expectImplicit(?int $expectedTag = null): ImplicitTagging
+	{
+		$el = $this;
+		if (!$el instanceof ImplicitTagging) {
+			throw new \UnexpectedValueException(
+				"Element doesn't implement implicit tagging.");
+		}
+		if (isset($expectedTag)) {
+			$el->expectTagged($expectedTag);
+		}
+		return $el;
+	}
 
-    /**
-     * Get the wrapped inner element employing implicit tagging.
-     *
-     * @param int      $tag           Type tag of the inner element
-     * @param null|int $expectedTag   Optional outer tag expectation
-     * @param int      $expectedClass Optional inner type class expectation
-     *
-     * @throws \UnexpectedValueException If expectation fails
-     *
-     * @return UnspecifiedType
-     */
-    public function asImplicit(int $tag, ?int $expectedTag = null,
-        int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
-    {
-        return $this->expectImplicit($expectedTag)->implicit($tag,
-            $expectedClass);
-    }
+	/**
+	 * Get the wrapped inner element employing implicit tagging.
+	 *
+	 * @param int      $tag           Type tag of the inner element
+	 * @param null|int $expectedTag   Optional outer tag expectation
+	 * @param int      $expectedClass Optional inner type class expectation
+	 *
+	 * @throws \UnexpectedValueException If expectation fails
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function asImplicit(int $tag, ?int $expectedTag = null,
+		int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		return $this->expectImplicit($expectedTag)->implicit($tag,
+			$expectedClass);
+	}
 }

lib/ASN1/Util/Flags.php

Indentation +137 added lines, -137 removed lines

@@ -11,149 +11,149 @@
  */
 class Flags
 {
-    /**
-     * Flag octets.
-     *
-     * @var string
-     */
-    protected $_flags;
+	/**
+	 * Flag octets.
+	 *
+	 * @var string
+	 */
+	protected $_flags;
 
-    /**
-     * Number of flags.
-     *
-     * @var int
-     */
-    protected $_width;
+	/**
+	 * Number of flags.
+	 *
+	 * @var int
+	 */
+	protected $_width;
 
-    /**
-     * Constructor.
-     *
-     * @param int|string $flags Flags
-     * @param int        $width The number of flags. If width is larger than
-     *                          number of bits in $flags, zeroes are prepended
-     *                          to flag field.
-     */
-    public function __construct($flags, int $width)
-    {
-        if (!$width) {
-            $this->_flags = '';
-        } else {
-            // calculate number of unused bits in last octet
-            $last_octet_bits = $width % 8;
-            $unused_bits = $last_octet_bits ? 8 - $last_octet_bits : 0;
-            $num = gmp_init($flags);
-            // mask bits outside bitfield width
-            $mask = gmp_sub(gmp_init(1) << $width, 1);
-            $num &= $mask;
-            // shift towards MSB if needed
-            $data = gmp_export($num << $unused_bits, 1,
-                GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-            $octets = unpack('C*', $data);
-            assert(is_array($octets), new \RuntimeException('unpack() failed'));
-            $bits = count($octets) * 8;
-            // pad with zeroes
-            while ($bits < $width) {
-                array_unshift($octets, 0);
-                $bits += 8;
-            }
-            $this->_flags = pack('C*', ...$octets);
-        }
-        $this->_width = $width;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $flags Flags
+	 * @param int        $width The number of flags. If width is larger than
+	 *                          number of bits in $flags, zeroes are prepended
+	 *                          to flag field.
+	 */
+	public function __construct($flags, int $width)
+	{
+		if (!$width) {
+			$this->_flags = '';
+		} else {
+			// calculate number of unused bits in last octet
+			$last_octet_bits = $width % 8;
+			$unused_bits = $last_octet_bits ? 8 - $last_octet_bits : 0;
+			$num = gmp_init($flags);
+			// mask bits outside bitfield width
+			$mask = gmp_sub(gmp_init(1) << $width, 1);
+			$num &= $mask;
+			// shift towards MSB if needed
+			$data = gmp_export($num << $unused_bits, 1,
+				GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+			$octets = unpack('C*', $data);
+			assert(is_array($octets), new \RuntimeException('unpack() failed'));
+			$bits = count($octets) * 8;
+			// pad with zeroes
+			while ($bits < $width) {
+				array_unshift($octets, 0);
+				$bits += 8;
+			}
+			$this->_flags = pack('C*', ...$octets);
+		}
+		$this->_width = $width;
+	}
 
-    /**
-     * Initialize from BitString.
-     *
-     * @param BitString $bs
-     * @param int       $width
-     *
-     * @return self
-     */
-    public static function fromBitString(BitString $bs, int $width): self
-    {
-        $num_bits = $bs->numBits();
-        $num = gmp_import($bs->string(), 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        $num >>= $bs->unusedBits();
-        if ($num_bits < $width) {
-            $num <<= ($width - $num_bits);
-        }
-        return new self(gmp_strval($num, 10), $width);
-    }
+	/**
+	 * Initialize from BitString.
+	 *
+	 * @param BitString $bs
+	 * @param int       $width
+	 *
+	 * @return self
+	 */
+	public static function fromBitString(BitString $bs, int $width): self
+	{
+		$num_bits = $bs->numBits();
+		$num = gmp_import($bs->string(), 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		$num >>= $bs->unusedBits();
+		if ($num_bits < $width) {
+			$num <<= ($width - $num_bits);
+		}
+		return new self(gmp_strval($num, 10), $width);
+	}
 
-    /**
-     * Check whether a bit at given index is set.
-     *
-     * Index 0 is the leftmost bit.
-     *
-     * @param int $idx
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return bool
-     */
-    public function test(int $idx): bool
-    {
-        if ($idx >= $this->_width) {
-            throw new \OutOfBoundsException('Index is out of bounds.');
-        }
-        // octet index
-        $oi = (int) floor($idx / 8);
-        $byte = $this->_flags[$oi];
-        // bit index
-        $bi = $idx % 8;
-        // index 0 is the most significant bit in byte
-        $mask = 0x01 << (7 - $bi);
-        return (ord($byte) & $mask) > 0;
-    }
+	/**
+	 * Check whether a bit at given index is set.
+	 *
+	 * Index 0 is the leftmost bit.
+	 *
+	 * @param int $idx
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return bool
+	 */
+	public function test(int $idx): bool
+	{
+		if ($idx >= $this->_width) {
+			throw new \OutOfBoundsException('Index is out of bounds.');
+		}
+		// octet index
+		$oi = (int) floor($idx / 8);
+		$byte = $this->_flags[$oi];
+		// bit index
+		$bi = $idx % 8;
+		// index 0 is the most significant bit in byte
+		$mask = 0x01 << (7 - $bi);
+		return (ord($byte) & $mask) > 0;
+	}
 
-    /**
-     * Get flags as an octet string.
-     *
-     * Zeroes are appended to the last octet if width is not divisible by 8.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_flags;
-    }
+	/**
+	 * Get flags as an octet string.
+	 *
+	 * Zeroes are appended to the last octet if width is not divisible by 8.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_flags;
+	}
 
-    /**
-     * Get flags as a base 10 integer.
-     *
-     * @return string Integer as a string
-     */
-    public function number(): string
-    {
-        $num = gmp_import($this->_flags, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        $last_octet_bits = $this->_width % 8;
-        $unused_bits = $last_octet_bits ? 8 - $last_octet_bits : 0;
-        $num >>= $unused_bits;
-        return gmp_strval($num, 10);
-    }
+	/**
+	 * Get flags as a base 10 integer.
+	 *
+	 * @return string Integer as a string
+	 */
+	public function number(): string
+	{
+		$num = gmp_import($this->_flags, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		$last_octet_bits = $this->_width % 8;
+		$unused_bits = $last_octet_bits ? 8 - $last_octet_bits : 0;
+		$num >>= $unused_bits;
+		return gmp_strval($num, 10);
+	}
 
-    /**
-     * Get flags as an integer.
-     *
-     * @return int
-     */
-    public function intNumber(): int
-    {
-        $num = new BigInt($this->number());
-        return $num->intVal();
-    }
+	/**
+	 * Get flags as an integer.
+	 *
+	 * @return int
+	 */
+	public function intNumber(): int
+	{
+		$num = new BigInt($this->number());
+		return $num->intVal();
+	}
 
-    /**
-     * Get flags as a BitString.
-     *
-     * Unused bits are set accordingly. Trailing zeroes are not stripped.
-     *
-     * @return BitString
-     */
-    public function bitString(): BitString
-    {
-        $last_octet_bits = $this->_width % 8;
-        $unused_bits = $last_octet_bits ? 8 - $last_octet_bits : 0;
-        return new BitString($this->_flags, $unused_bits);
-    }
+	/**
+	 * Get flags as a BitString.
+	 *
+	 * Unused bits are set accordingly. Trailing zeroes are not stripped.
+	 *
+	 * @return BitString
+	 */
+	public function bitString(): BitString
+	{
+		$last_octet_bits = $this->_width % 8;
+		$unused_bits = $last_octet_bits ? 8 - $last_octet_bits : 0;
+		return new BitString($this->_flags, $unused_bits);
+	}
 }

lib/ASN1/Type/Tagged/DERTaggedType.php

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/ExplicitTagging.php

Indentation +6 added lines, -6 removed lines

@@ -12,10 +12,10 @@
  */
 interface ExplicitTagging extends ElementBase
 {
-    /**
-     * Get explicitly tagged wrapped element.
-     *
-     * @return UnspecifiedType
-     */
-    public function explicit(): UnspecifiedType;
+	/**
+	 * Get explicitly tagged wrapped element.
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function explicit(): UnspecifiedType;
 }