sop / asn1

lib/ASN1/DERData.php

Indentation +71 added lines, -71 removed lines

@@ -14,82 +14,82 @@
  */
 class DERData extends Element
 {
-    /**
-     * DER encoded data.
-     *
-     * @var string $_der
-     */
-    protected $_der;
+	/**
+	 * DER encoded data.
+	 *
+	 * @var string $_der
+	 */
+	protected $_der;
     
-    /**
-     * Identifier of the underlying type.
-     *
-     * @var Identifier $_identifier
-     */
-    protected $_identifier;
+	/**
+	 * Identifier of the underlying type.
+	 *
+	 * @var Identifier $_identifier
+	 */
+	protected $_identifier;
     
-    /**
-     * Offset to the content in DER data.
-     *
-     * @var int $_contentOffset
-     */
-    protected $_contentOffset = 0;
+	/**
+	 * Offset to the content in DER data.
+	 *
+	 * @var int $_contentOffset
+	 */
+	protected $_contentOffset = 0;
     
-    /**
-     * Constructor.
-     *
-     * @param string $data DER encoded data
-     * @throws \ASN1\Exception\DecodeException If data does not adhere to DER
-     */
-    public function __construct(string $data)
-    {
-        $this->_identifier = Identifier::fromDER($data, $this->_contentOffset);
-        Length::expectFromDER($data, $this->_contentOffset);
-        $this->_der = $data;
-        $this->_typeTag = $this->_identifier->intTag();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $data DER encoded data
+	 * @throws \ASN1\Exception\DecodeException If data does not adhere to DER
+	 */
+	public function __construct(string $data)
+	{
+		$this->_identifier = Identifier::fromDER($data, $this->_contentOffset);
+		Length::expectFromDER($data, $this->_contentOffset);
+		$this->_der = $data;
+		$this->_typeTag = $this->_identifier->intTag();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_identifier->typeClass();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_identifier->typeClass();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return $this->_identifier->isConstructed();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return $this->_identifier->isConstructed();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        // if there's no content payload
-        if (strlen($this->_der) == $this->_contentOffset) {
-            return "";
-        }
-        return substr($this->_der, $this->_contentOffset);
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		// if there's no content payload
+		if (strlen($this->_der) == $this->_contentOffset) {
+			return "";
+		}
+		return substr($this->_der, $this->_contentOffset);
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::toDER()
-     * @return string
-     */
-    public function toDER(): string
-    {
-        return $this->_der;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::toDER()
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		return $this->_der;
+	}
 }

lib/ASN1/Type/Primitive/BitString.php

Indentation +181 added lines, -181 removed lines

@@ -17,194 +17,194 @@
  */
 class BitString extends StringType
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Number of unused bits in the last octet.
-     *
-     * @var int $_unusedBits
-     */
-    protected $_unusedBits;
+	/**
+	 * Number of unused bits in the last octet.
+	 *
+	 * @var int $_unusedBits
+	 */
+	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 boolean
-     */
-    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 boolean
+	 */
+	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 ($bits[$idx] != "\x0") {
-                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 ($bits[$idx] != "\x0") {
+				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}
-     * @return self
-     */
-    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}
+	 * @return self
+	 */
+	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/ObjectIdentifier.php

Indentation +147 added lines, -147 removed lines

@@ -17,160 +17,160 @@
  */
 class ObjectIdentifier extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Object identifier in dotted format.
-     *
-     * @var string
-     */
-    protected $_oid;
+	/**
+	 * Object identifier in dotted format.
+	 *
+	 * @var string
+	 */
+	protected $_oid;
     
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-        $this->_typeTag = self::TYPE_OBJECT_IDENTIFIER;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+		$this->_typeTag = self::TYPE_OBJECT_IDENTIFIER;
+	}
     
-    /**
-     * Get OID in dotted format.
-     *
-     * @return string
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get OID in dotted format.
+	 *
+	 * @return string
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $subids = self::_explodeDottedOID($this->_oid);
-        // encode first two subids to one according to spec section 8.19.4
-        if (count($subids) >= 2) {
-            $num = ($subids[0] * 40) + $subids[1];
-            array_splice($subids, 0, 2, array($num));
-        }
-        return self::_encodeSubIDs(...$subids);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$subids = self::_explodeDottedOID($this->_oid);
+		// encode first two subids to one according to spec section 8.19.4
+		if (count($subids) >= 2) {
+			$num = ($subids[0] * 40) + $subids[1];
+			array_splice($subids, 0, 2, array($num));
+		}
+		return self::_encodeSubIDs(...$subids);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    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));
-        $idx += $len;
-        // decode first subidentifier according to spec section 8.19.4
-        if (isset($subids[0])) {
-            list($x, $y) = gmp_div_qr($subids[0], "40");
-            array_splice($subids, 0, 1, array($x, $y));
-        }
-        $offset = $idx;
-        return new self(self::_implodeSubIDs(...$subids));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	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));
+		$idx += $len;
+		// decode first subidentifier according to spec section 8.19.4
+		if (isset($subids[0])) {
+			list($x, $y) = gmp_div_qr($subids[0], "40");
+			array_splice($subids, 0, 1, array($x, $y));
+		}
+		$offset = $idx;
+		return new self(self::_implodeSubIDs(...$subids));
+	}
     
-    /**
-     * Explode dotted OID to an array of sub ID's.
-     *
-     * @param string $oid OID in dotted format
-     * @return \GMP[] Array of GMP numbers
-     */
-    protected static function _explodeDottedOID(string $oid): array
-    {
-        $subids = [];
-        foreach (explode(".", $oid) as $subid) {
-            $subids[] = gmp_init($subid, 10);
-        }
-        return $subids;
-    }
+	/**
+	 * Explode dotted OID to an array of sub ID's.
+	 *
+	 * @param string $oid OID in dotted format
+	 * @return \GMP[] Array of GMP numbers
+	 */
+	protected static function _explodeDottedOID(string $oid): array
+	{
+		$subids = [];
+		foreach (explode(".", $oid) as $subid) {
+			$subids[] = gmp_init($subid, 10);
+		}
+		return $subids;
+	}
     
-    /**
-     * Implode an array of sub IDs to dotted OID format.
-     *
-     * @param \GMP[] $subids
-     * @return string
-     */
-    protected static function _implodeSubIDs(\GMP ...$subids): string
-    {
-        return implode(".",
-            array_map(
-                function ($num) {
-                    return gmp_strval($num, 10);
-                }, $subids));
-    }
+	/**
+	 * Implode an array of sub IDs to dotted OID format.
+	 *
+	 * @param \GMP[] $subids
+	 * @return string
+	 */
+	protected static function _implodeSubIDs(\GMP ...$subids): string
+	{
+		return implode(".",
+			array_map(
+				function ($num) {
+					return gmp_strval($num, 10);
+				}, $subids));
+	}
     
-    /**
-     * Encode sub ID's to DER.
-     *
-     * @param \GMP[] $subids
-     * @return string
-     */
-    protected static function _encodeSubIDs(\GMP ...$subids): string
-    {
-        $data = "";
-        foreach ($subids as $subid) {
-            // if number fits to one base 128 byte
-            if ($subid < 128) {
-                $data .= chr(intval($subid));
-            } else { // encode to multiple bytes
-                $bytes = [];
-                do {
-                    array_unshift($bytes, 0x7f & gmp_intval($subid));
-                    $subid >>= 7;
-                } while ($subid > 0);
-                // all bytes except last must have bit 8 set to one
-                foreach (array_splice($bytes, 0, -1) as $byte) {
-                    $data .= chr(0x80 | $byte);
-                }
-                $data .= chr(reset($bytes));
-            }
-        }
-        return $data;
-    }
+	/**
+	 * Encode sub ID's to DER.
+	 *
+	 * @param \GMP[] $subids
+	 * @return string
+	 */
+	protected static function _encodeSubIDs(\GMP ...$subids): string
+	{
+		$data = "";
+		foreach ($subids as $subid) {
+			// if number fits to one base 128 byte
+			if ($subid < 128) {
+				$data .= chr(intval($subid));
+			} else { // encode to multiple bytes
+				$bytes = [];
+				do {
+					array_unshift($bytes, 0x7f & gmp_intval($subid));
+					$subid >>= 7;
+				} while ($subid > 0);
+				// all bytes except last must have bit 8 set to one
+				foreach (array_splice($bytes, 0, -1) as $byte) {
+					$data .= chr(0x80 | $byte);
+				}
+				$data .= chr(reset($bytes));
+			}
+		}
+		return $data;
+	}
     
-    /**
-     * Decode sub ID's from DER data.
-     *
-     * @param string $data
-     * @throws DecodeException
-     * @return \GMP[] Array of GMP numbers
-     */
-    protected static function _decodeSubIDs(string $data): array
-    {
-        $subids = [];
-        $idx = 0;
-        $end = strlen($data);
-        while ($idx < $end) {
-            $num = gmp_init("0", 10);
-            while (true) {
-                if ($idx >= $end) {
-                    throw new DecodeException("Unexpected end of data.");
-                }
-                $byte = ord($data[$idx++]);
-                $num |= $byte & 0x7f;
-                // bit 8 of the last octet is zero
-                if (!($byte & 0x80)) {
-                    break;
-                }
-                $num <<= 7;
-            }
-            $subids[] = $num;
-        }
-        return $subids;
-    }
+	/**
+	 * Decode sub ID's from DER data.
+	 *
+	 * @param string $data
+	 * @throws DecodeException
+	 * @return \GMP[] Array of GMP numbers
+	 */
+	protected static function _decodeSubIDs(string $data): array
+	{
+		$subids = [];
+		$idx = 0;
+		$end = strlen($data);
+		while ($idx < $end) {
+			$num = gmp_init("0", 10);
+			while (true) {
+				if ($idx >= $end) {
+					throw new DecodeException("Unexpected end of data.");
+				}
+				$byte = ord($data[$idx++]);
+				$num |= $byte & 0x7f;
+				// bit 8 of the last octet is zero
+				if (!($byte & 0x80)) {
+					break;
+				}
+				$num <<= 7;
+			}
+			$subids[] = $num;
+		}
+		return $subids;
+	}
 }

lib/ASN1/Type/UnspecifiedType.php

Indentation +609 added lines, -609 removed lines

@@ -17,613 +17,613 @@
  */
 class UnspecifiedType implements ElementBase
 {
-    /**
-     * The wrapped element.
-     *
-     * @var Element
-     */
-    private $_element;
-    
-    /**
-     * Constructor.
-     *
-     * @param Element $el
-     */
-    public function __construct(Element $el)
-    {
-        $this->_element = $el;
-    }
-    
-    /**
-     * Initialize from ElementBase interface.
-     *
-     * @param ElementBase $el
-     * @return self
-     */
-    public static function fromElementBase(ElementBase $el): self
-    {
-        // if element is already wrapped
-        if ($el instanceof self) {
-            return $el;
-        }
-        return new self($el->asElement());
-    }
-    
-    /**
-     * Compatibility method to dispatch calls to the wrapped element.
-     *
-     * @deprecated Use <code>as*</code> accessor methods to ensure strict type
-     * @param string $mtd Method name
-     * @param array $args Arguments
-     * @return mixed
-     */
-    public function __call($mtd, array $args)
-    {
-        return call_user_func_array([$this->_element, $mtd], $args);
-    }
-    
-    /**
-     * Get the wrapped element as a context specific tagged type.
-     *
-     * @throws \UnexpectedValueException If the element is not tagged
-     * @return TaggedType
-     */
-    public function asTagged(): TaggedType
-    {
-        if (!$this->_element instanceof TaggedType) {
-            throw new \UnexpectedValueException(
-                "Tagged element expected, got " . $this->_typeDescriptorString());
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a boolean type.
-     *
-     * @throws \UnexpectedValueException If the element is not a boolean
-     * @return Primitive\Boolean
-     */
-    public function asBoolean(): Primitive\Boolean
-    {
-        if (!$this->_element instanceof Primitive\Boolean) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_BOOLEAN));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an integer type.
-     *
-     * @throws \UnexpectedValueException If the element is not an integer
-     * @return Primitive\Integer
-     */
-    public function asInteger(): Primitive\Integer
-    {
-        if (!$this->_element instanceof Primitive\Integer) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_INTEGER));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a bit string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a bit string
-     * @return Primitive\BitString
-     */
-    public function asBitString(): Primitive\BitString
-    {
-        if (!$this->_element instanceof Primitive\BitString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_BIT_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an octet string type.
-     *
-     * @throws \UnexpectedValueException If the element is not an octet string
-     * @return Primitive\OctetString
-     */
-    public function asOctetString(): Primitive\OctetString
-    {
-        if (!$this->_element instanceof Primitive\OctetString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_OCTET_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a null type.
-     *
-     * @throws \UnexpectedValueException If the element is not a null
-     * @return Primitive\NullType
-     */
-    public function asNull(): Primitive\NullType
-    {
-        if (!$this->_element instanceof Primitive\NullType) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_NULL));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an object identifier type.
-     *
-     * @throws \UnexpectedValueException If the element is not an object
-     *         identifier
-     * @return Primitive\ObjectIdentifier
-     */
-    public function asObjectIdentifier(): Primitive\ObjectIdentifier
-    {
-        if (!$this->_element instanceof Primitive\ObjectIdentifier) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(
-                    Element::TYPE_OBJECT_IDENTIFIER));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an object descriptor type.
-     *
-     * @throws \UnexpectedValueException If the element is not an object
-     *         descriptor
-     * @return Primitive\ObjectDescriptor
-     */
-    public function asObjectDescriptor(): Primitive\ObjectDescriptor
-    {
-        if (!$this->_element instanceof Primitive\ObjectDescriptor) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(
-                    Element::TYPE_OBJECT_DESCRIPTOR));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a real type.
-     *
-     * @throws \UnexpectedValueException If the element is not a real
-     * @return Primitive\Real
-     */
-    public function asReal(): Primitive\Real
-    {
-        if (!$this->_element instanceof Primitive\Real) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_REAL));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an enumerated type.
-     *
-     * @throws \UnexpectedValueException If the element is not an enumerated
-     * @return Primitive\Enumerated
-     */
-    public function asEnumerated(): Primitive\Enumerated
-    {
-        if (!$this->_element instanceof Primitive\Enumerated) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_ENUMERATED));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a UTF8 string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a UTF8 string
-     * @return Primitive\UTF8String
-     */
-    public function asUTF8String(): Primitive\UTF8String
-    {
-        if (!$this->_element instanceof Primitive\UTF8String) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_UTF8_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a relative OID type.
-     *
-     * @throws \UnexpectedValueException If the element is not a relative OID
-     * @return Primitive\RelativeOID
-     */
-    public function asRelativeOID(): Primitive\RelativeOID
-    {
-        if (!$this->_element instanceof Primitive\RelativeOID) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_RELATIVE_OID));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a sequence type.
-     *
-     * @throws \UnexpectedValueException If the element is not a sequence
-     * @return Constructed\Sequence
-     */
-    public function asSequence(): Constructed\Sequence
-    {
-        if (!$this->_element instanceof Constructed\Sequence) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_SEQUENCE));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a set type.
-     *
-     * @throws \UnexpectedValueException If the element is not a set
-     * @return Constructed\Set
-     */
-    public function asSet(): Constructed\Set
-    {
-        if (!$this->_element instanceof Constructed\Set) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_SET));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a numeric string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a numeric string
-     * @return Primitive\NumericString
-     */
-    public function asNumericString(): Primitive\NumericString
-    {
-        if (!$this->_element instanceof Primitive\NumericString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_NUMERIC_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a printable string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a printable
-     *         string
-     * @return Primitive\PrintableString
-     */
-    public function asPrintableString(): Primitive\PrintableString
-    {
-        if (!$this->_element instanceof Primitive\PrintableString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_PRINTABLE_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a T61 string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a T61 string
-     * @return Primitive\T61String
-     */
-    public function asT61String(): Primitive\T61String
-    {
-        if (!$this->_element instanceof Primitive\T61String) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_T61_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a videotex string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a videotex string
-     * @return Primitive\VideotexString
-     */
-    public function asVideotexString(): Primitive\VideotexString
-    {
-        if (!$this->_element instanceof Primitive\VideotexString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_VIDEOTEX_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a IA5 string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a IA5 string
-     * @return Primitive\IA5String
-     */
-    public function asIA5String(): Primitive\IA5String
-    {
-        if (!$this->_element instanceof Primitive\IA5String) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_IA5_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an UTC time type.
-     *
-     * @throws \UnexpectedValueException If the element is not a UTC time
-     * @return Primitive\UTCTime
-     */
-    public function asUTCTime(): Primitive\UTCTime
-    {
-        if (!$this->_element instanceof Primitive\UTCTime) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_UTC_TIME));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a generalized time type.
-     *
-     * @throws \UnexpectedValueException If the element is not a generalized
-     *         time
-     * @return Primitive\GeneralizedTime
-     */
-    public function asGeneralizedTime(): Primitive\GeneralizedTime
-    {
-        if (!$this->_element instanceof Primitive\GeneralizedTime) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_GENERALIZED_TIME));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a graphic string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a graphic string
-     * @return Primitive\GraphicString
-     */
-    public function asGraphicString(): Primitive\GraphicString
-    {
-        if (!$this->_element instanceof Primitive\GraphicString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_GRAPHIC_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a visible string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a visible string
-     * @return Primitive\VisibleString
-     */
-    public function asVisibleString(): Primitive\VisibleString
-    {
-        if (!$this->_element instanceof Primitive\VisibleString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_VISIBLE_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a general string type.
-     *
-     * @throws \UnexpectedValueException If the element is not general string
-     * @return Primitive\GeneralString
-     */
-    public function asGeneralString(): Primitive\GeneralString
-    {
-        if (!$this->_element instanceof Primitive\GeneralString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_GENERAL_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a universal string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a universal
-     *         string
-     * @return Primitive\UniversalString
-     */
-    public function asUniversalString(): Primitive\UniversalString
-    {
-        if (!$this->_element instanceof Primitive\UniversalString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_UNIVERSAL_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a character string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a character
-     *         string
-     * @return Primitive\CharacterString
-     */
-    public function asCharacterString(): Primitive\CharacterString
-    {
-        if (!$this->_element instanceof Primitive\CharacterString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_CHARACTER_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a BMP string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a bmp string
-     * @return Primitive\BMPString
-     */
-    public function asBMPString(): Primitive\BMPString
-    {
-        if (!$this->_element instanceof Primitive\BMPString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_BMP_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as any string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a string
-     * @return StringType
-     */
-    public function asString(): StringType
-    {
-        if (!$this->_element instanceof StringType) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as any time type.
-     *
-     * @throws \UnexpectedValueException If the element is not a time
-     * @return TimeType
-     */
-    public function asTime(): TimeType
-    {
-        if (!$this->_element instanceof TimeType) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_TIME));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Generate message for exceptions thrown by <code>as*</code> methods.
-     *
-     * @param int $tag Type tag of the expected element
-     * @return string
-     */
-    private function _generateExceptionMessage(int $tag): string
-    {
-        return sprintf("%s expected, got %s.", Element::tagToName($tag),
-            $this->_typeDescriptorString());
-    }
-    
-    /**
-     * Get textual description of the wrapped element for debugging purposes.
-     *
-     * @return string
-     */
-    private function _typeDescriptorString(): string
-    {
-        $type_cls = $this->_element->typeClass();
-        $tag = $this->_element->tag();
-        if ($type_cls == Identifier::CLASS_UNIVERSAL) {
-            return Element::tagToName($tag);
-        }
-        return Identifier::classToName($type_cls) . " TAG $tag";
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\Encodable::toDER()
-     * @return string
-     */
-    public function toDER(): string
-    {
-        return $this->_element->toDER();
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_element->typeClass();
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return $this->_element->isConstructed();
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::tag()
-     * @return int
-     */
-    public function tag(): int
-    {
-        return $this->_element->tag();
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Feature\ElementBase::isType()
-     * @return bool
-     */
-    public function isType(int $tag): bool
-    {
-        return $this->_element->isType($tag);
-    }
-    
-    /**
-     *
-     * @deprecated Use any <code>as*</code> accessor method first to ensure
-     *             type strictness.
-     * @see \ASN1\Feature\ElementBase::expectType()
-     * @return ElementBase
-     */
-    public function expectType(int $tag): ElementBase
-    {
-        return $this->_element->expectType($tag);
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isTagged()
-     * @return bool
-     */
-    public function isTagged(): bool
-    {
-        return $this->_element->isTagged();
-    }
-    
-    /**
-     *
-     * @deprecated Use any <code>as*</code> accessor method first to ensure
-     *             type strictness.
-     * @see \ASN1\Feature\ElementBase::expectTagged()
-     * @return TaggedType
-     */
-    public function expectTagged($tag = null): TaggedType
-    {
-        return $this->_element->expectTagged($tag);
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::asElement()
-     * @return Element
-     */
-    public function asElement(): Element
-    {
-        return $this->_element;
-    }
+	/**
+	 * The wrapped element.
+	 *
+	 * @var Element
+	 */
+	private $_element;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param Element $el
+	 */
+	public function __construct(Element $el)
+	{
+		$this->_element = $el;
+	}
+    
+	/**
+	 * Initialize from ElementBase interface.
+	 *
+	 * @param ElementBase $el
+	 * @return self
+	 */
+	public static function fromElementBase(ElementBase $el): self
+	{
+		// if element is already wrapped
+		if ($el instanceof self) {
+			return $el;
+		}
+		return new self($el->asElement());
+	}
+    
+	/**
+	 * Compatibility method to dispatch calls to the wrapped element.
+	 *
+	 * @deprecated Use <code>as*</code> accessor methods to ensure strict type
+	 * @param string $mtd Method name
+	 * @param array $args Arguments
+	 * @return mixed
+	 */
+	public function __call($mtd, array $args)
+	{
+		return call_user_func_array([$this->_element, $mtd], $args);
+	}
+    
+	/**
+	 * Get the wrapped element as a context specific tagged type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not tagged
+	 * @return TaggedType
+	 */
+	public function asTagged(): TaggedType
+	{
+		if (!$this->_element instanceof TaggedType) {
+			throw new \UnexpectedValueException(
+				"Tagged element expected, got " . $this->_typeDescriptorString());
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a boolean type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a boolean
+	 * @return Primitive\Boolean
+	 */
+	public function asBoolean(): Primitive\Boolean
+	{
+		if (!$this->_element instanceof Primitive\Boolean) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_BOOLEAN));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an integer type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an integer
+	 * @return Primitive\Integer
+	 */
+	public function asInteger(): Primitive\Integer
+	{
+		if (!$this->_element instanceof Primitive\Integer) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_INTEGER));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a bit string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a bit string
+	 * @return Primitive\BitString
+	 */
+	public function asBitString(): Primitive\BitString
+	{
+		if (!$this->_element instanceof Primitive\BitString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_BIT_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an octet string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an octet string
+	 * @return Primitive\OctetString
+	 */
+	public function asOctetString(): Primitive\OctetString
+	{
+		if (!$this->_element instanceof Primitive\OctetString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_OCTET_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a null type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a null
+	 * @return Primitive\NullType
+	 */
+	public function asNull(): Primitive\NullType
+	{
+		if (!$this->_element instanceof Primitive\NullType) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_NULL));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an object identifier type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an object
+	 *         identifier
+	 * @return Primitive\ObjectIdentifier
+	 */
+	public function asObjectIdentifier(): Primitive\ObjectIdentifier
+	{
+		if (!$this->_element instanceof Primitive\ObjectIdentifier) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(
+					Element::TYPE_OBJECT_IDENTIFIER));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an object descriptor type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an object
+	 *         descriptor
+	 * @return Primitive\ObjectDescriptor
+	 */
+	public function asObjectDescriptor(): Primitive\ObjectDescriptor
+	{
+		if (!$this->_element instanceof Primitive\ObjectDescriptor) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(
+					Element::TYPE_OBJECT_DESCRIPTOR));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a real type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a real
+	 * @return Primitive\Real
+	 */
+	public function asReal(): Primitive\Real
+	{
+		if (!$this->_element instanceof Primitive\Real) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_REAL));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an enumerated type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an enumerated
+	 * @return Primitive\Enumerated
+	 */
+	public function asEnumerated(): Primitive\Enumerated
+	{
+		if (!$this->_element instanceof Primitive\Enumerated) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_ENUMERATED));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a UTF8 string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a UTF8 string
+	 * @return Primitive\UTF8String
+	 */
+	public function asUTF8String(): Primitive\UTF8String
+	{
+		if (!$this->_element instanceof Primitive\UTF8String) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_UTF8_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a relative OID type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a relative OID
+	 * @return Primitive\RelativeOID
+	 */
+	public function asRelativeOID(): Primitive\RelativeOID
+	{
+		if (!$this->_element instanceof Primitive\RelativeOID) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_RELATIVE_OID));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a sequence type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a sequence
+	 * @return Constructed\Sequence
+	 */
+	public function asSequence(): Constructed\Sequence
+	{
+		if (!$this->_element instanceof Constructed\Sequence) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_SEQUENCE));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a set type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a set
+	 * @return Constructed\Set
+	 */
+	public function asSet(): Constructed\Set
+	{
+		if (!$this->_element instanceof Constructed\Set) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_SET));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a numeric string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a numeric string
+	 * @return Primitive\NumericString
+	 */
+	public function asNumericString(): Primitive\NumericString
+	{
+		if (!$this->_element instanceof Primitive\NumericString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_NUMERIC_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a printable string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a printable
+	 *         string
+	 * @return Primitive\PrintableString
+	 */
+	public function asPrintableString(): Primitive\PrintableString
+	{
+		if (!$this->_element instanceof Primitive\PrintableString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_PRINTABLE_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a T61 string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a T61 string
+	 * @return Primitive\T61String
+	 */
+	public function asT61String(): Primitive\T61String
+	{
+		if (!$this->_element instanceof Primitive\T61String) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_T61_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a videotex string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a videotex string
+	 * @return Primitive\VideotexString
+	 */
+	public function asVideotexString(): Primitive\VideotexString
+	{
+		if (!$this->_element instanceof Primitive\VideotexString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_VIDEOTEX_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a IA5 string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a IA5 string
+	 * @return Primitive\IA5String
+	 */
+	public function asIA5String(): Primitive\IA5String
+	{
+		if (!$this->_element instanceof Primitive\IA5String) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_IA5_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an UTC time type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a UTC time
+	 * @return Primitive\UTCTime
+	 */
+	public function asUTCTime(): Primitive\UTCTime
+	{
+		if (!$this->_element instanceof Primitive\UTCTime) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_UTC_TIME));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a generalized time type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a generalized
+	 *         time
+	 * @return Primitive\GeneralizedTime
+	 */
+	public function asGeneralizedTime(): Primitive\GeneralizedTime
+	{
+		if (!$this->_element instanceof Primitive\GeneralizedTime) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_GENERALIZED_TIME));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a graphic string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a graphic string
+	 * @return Primitive\GraphicString
+	 */
+	public function asGraphicString(): Primitive\GraphicString
+	{
+		if (!$this->_element instanceof Primitive\GraphicString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_GRAPHIC_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a visible string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a visible string
+	 * @return Primitive\VisibleString
+	 */
+	public function asVisibleString(): Primitive\VisibleString
+	{
+		if (!$this->_element instanceof Primitive\VisibleString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_VISIBLE_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a general string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not general string
+	 * @return Primitive\GeneralString
+	 */
+	public function asGeneralString(): Primitive\GeneralString
+	{
+		if (!$this->_element instanceof Primitive\GeneralString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_GENERAL_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a universal string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a universal
+	 *         string
+	 * @return Primitive\UniversalString
+	 */
+	public function asUniversalString(): Primitive\UniversalString
+	{
+		if (!$this->_element instanceof Primitive\UniversalString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_UNIVERSAL_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a character string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a character
+	 *         string
+	 * @return Primitive\CharacterString
+	 */
+	public function asCharacterString(): Primitive\CharacterString
+	{
+		if (!$this->_element instanceof Primitive\CharacterString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_CHARACTER_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a BMP string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a bmp string
+	 * @return Primitive\BMPString
+	 */
+	public function asBMPString(): Primitive\BMPString
+	{
+		if (!$this->_element instanceof Primitive\BMPString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_BMP_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as any string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a string
+	 * @return StringType
+	 */
+	public function asString(): StringType
+	{
+		if (!$this->_element instanceof StringType) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as any time type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a time
+	 * @return TimeType
+	 */
+	public function asTime(): TimeType
+	{
+		if (!$this->_element instanceof TimeType) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_TIME));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Generate message for exceptions thrown by <code>as*</code> methods.
+	 *
+	 * @param int $tag Type tag of the expected element
+	 * @return string
+	 */
+	private function _generateExceptionMessage(int $tag): string
+	{
+		return sprintf("%s expected, got %s.", Element::tagToName($tag),
+			$this->_typeDescriptorString());
+	}
+    
+	/**
+	 * Get textual description of the wrapped element for debugging purposes.
+	 *
+	 * @return string
+	 */
+	private function _typeDescriptorString(): string
+	{
+		$type_cls = $this->_element->typeClass();
+		$tag = $this->_element->tag();
+		if ($type_cls == Identifier::CLASS_UNIVERSAL) {
+			return Element::tagToName($tag);
+		}
+		return Identifier::classToName($type_cls) . " TAG $tag";
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\Encodable::toDER()
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		return $this->_element->toDER();
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_element->typeClass();
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return $this->_element->isConstructed();
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::tag()
+	 * @return int
+	 */
+	public function tag(): int
+	{
+		return $this->_element->tag();
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Feature\ElementBase::isType()
+	 * @return bool
+	 */
+	public function isType(int $tag): bool
+	{
+		return $this->_element->isType($tag);
+	}
+    
+	/**
+	 *
+	 * @deprecated Use any <code>as*</code> accessor method first to ensure
+	 *             type strictness.
+	 * @see \ASN1\Feature\ElementBase::expectType()
+	 * @return ElementBase
+	 */
+	public function expectType(int $tag): ElementBase
+	{
+		return $this->_element->expectType($tag);
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isTagged()
+	 * @return bool
+	 */
+	public function isTagged(): bool
+	{
+		return $this->_element->isTagged();
+	}
+    
+	/**
+	 *
+	 * @deprecated Use any <code>as*</code> accessor method first to ensure
+	 *             type strictness.
+	 * @see \ASN1\Feature\ElementBase::expectTagged()
+	 * @return TaggedType
+	 */
+	public function expectTagged($tag = null): TaggedType
+	{
+		return $this->_element->expectTagged($tag);
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::asElement()
+	 * @return Element
+	 */
+	public function asElement(): Element
+	{
+		return $this->_element;
+	}
 }

lib/ASN1/Type/TaggedType.php

Indentation +77 added lines, -77 removed lines

@@ -17,85 +17,85 @@
  */
 abstract class TaggedType extends Element
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $type = new DERTaggedType($identifier, $data, $idx);
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $offset = $idx + $length;
-        return $type;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$type = new DERTaggedType($identifier, $data, $idx);
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$offset = $idx + $length;
+		return $type;
+	}
     
-    /**
-     * Check whether element supports explicit tagging.
-     *
-     * @param int|null $expectedTag Optional outer tag expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return ExplicitTagging
-     */
-    public function expectExplicit($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 int|null $expectedTag Optional outer tag expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return ExplicitTagging
+	 */
+	public function expectExplicit($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 int|null $expectedTag Optional outer tag expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return UnspecifiedType
-     */
-    public function asExplicit($expectedTag = null): UnspecifiedType
-    {
-        return $this->expectExplicit($expectedTag)->explicit();
-    }
+	/**
+	 * Get the wrapped inner element employing explicit tagging.
+	 *
+	 * @param int|null $expectedTag Optional outer tag expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return UnspecifiedType
+	 */
+	public function asExplicit($expectedTag = null): UnspecifiedType
+	{
+		return $this->expectExplicit($expectedTag)->explicit();
+	}
     
-    /**
-     * Check whether element supports implicit tagging.
-     *
-     * @param int|null $expectedTag Optional outer tag expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return ImplicitTagging
-     */
-    public function expectImplicit($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 int|null $expectedTag Optional outer tag expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return ImplicitTagging
+	 */
+	public function expectImplicit($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 int|null $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, $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 int|null $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, $expectedTag = null,
+		int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		return $this->expectImplicit($expectedTag)->implicit($tag,
+			$expectedClass);
+	}
 }

lib/ASN1/Type/TimeType.php

Indentation +77 added lines, -77 removed lines

@@ -11,87 +11,87 @@
  */
 abstract class TimeType extends Element
 {
-    /**
-     * UTC timezone.
-     *
-     * @var string
-     */
-    const TZ_UTC = "UTC";
+	/**
+	 * UTC timezone.
+	 *
+	 * @var string
+	 */
+	const TZ_UTC = "UTC";
     
-    /**
-     * Date and time.
-     *
-     * @var \DateTimeImmutable $_dateTime
-     */
-    protected $_dateTime;
+	/**
+	 * Date and time.
+	 *
+	 * @var \DateTimeImmutable $_dateTime
+	 */
+	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;
+	}
     
-    /**
-     * Initialize from datetime string.
-     *
-     * @param string $time Time string
-     * @param string|null $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.
+	 *
+	 * @param string $time Time string
+	 * @param string|null $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;
+	}
     
-    /**
-     * 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/Tagged/DERTaggedType.php

Indentation +92 added lines, -92 removed lines

@@ -20,105 +20,105 @@
  * May be encoded back to complete DER encoding.
  */
 class DERTaggedType extends TaggedType implements 
-    ExplicitTagging,
-    ImplicitTagging
+	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 data.
-     *
-     * @var int
-     */
-    private $_offset;
+	/**
+	 * Offset to data.
+	 *
+	 * @var int
+	 */
+	private $_offset;
     
-    /**
-     * Constructor.
-     *
-     * @param Identifier $identifier
-     * @param string $data
-     * @param int $offset Offset to next byte after identifier
-     */
-    public function __construct(Identifier $identifier, string $data, int $offset)
-    {
-        $this->_identifier = $identifier;
-        $this->_data = $data;
-        $this->_offset = $offset;
-        $this->_typeTag = $identifier->intTag();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Identifier $identifier
+	 * @param string $data
+	 * @param int $offset Offset to next byte after identifier
+	 */
+	public function __construct(Identifier $identifier, string $data, int $offset)
+	{
+		$this->_identifier = $identifier;
+		$this->_data = $data;
+		$this->_offset = $offset;
+		$this->_typeTag = $identifier->intTag();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_identifier->typeClass();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_identifier->typeClass();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return $this->_identifier->isConstructed();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return $this->_identifier->isConstructed();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        $idx = $this->_offset;
-        $length = Length::expectFromDER($this->_data, $idx)->intLength();
-        return substr($this->_data, $idx, $length);
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$idx = $this->_offset;
+		$length = Length::expectFromDER($this->_data, $idx)->intLength();
+		return substr($this->_data, $idx, $length);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
-     * @return UnspecifiedType
-     */
-    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;
-        $element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
-        return new UnspecifiedType($element);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
+	 * @return UnspecifiedType
+	 */
+	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;
+		$element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
+		return new UnspecifiedType($element);
+	}
     
-    /**
-     *
-     * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
-     * @return UnspecifiedType
-     */
-    public function explicit($expectedTag = null): UnspecifiedType
-    {
-        $idx = $this->_offset;
-        Length::expectFromDER($this->_data, $idx);
-        $element = Element::fromDER($this->_data, $idx);
-        if (isset($expectedTag)) {
-            $element->expectType($expectedTag);
-        }
-        return new UnspecifiedType($element);
-    }
+	/**
+	 *
+	 * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
+	 * @return UnspecifiedType
+	 */
+	public function explicit($expectedTag = null): UnspecifiedType
+	{
+		$idx = $this->_offset;
+		Length::expectFromDER($this->_data, $idx);
+		$element = Element::fromDER($this->_data, $idx);
+		if (isset($expectedTag)) {
+			$element->expectType($expectedTag);
+		}
+		return new UnspecifiedType($element);
+	}
 }

lib/ASN1/Type/Tagged/ImplicitlyTaggedType.php

Indentation +48 added lines, -48 removed lines

@@ -16,56 +16,56 @@
  * decoding the data.
  */
 class ImplicitlyTaggedType extends ContextSpecificTaggedType implements 
-    ImplicitTagging
+	ImplicitTagging
 {
-    /**
-     * Constructor.
-     *
-     * @param int $tag
-     * @param Element $element
-     */
-    public function __construct(int $tag, Element $element)
-    {
-        $this->_typeTag = $tag;
-        $this->_element = $element;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $tag
+	 * @param Element $element
+	 */
+	public function __construct(int $tag, Element $element)
+	{
+		$this->_typeTag = $tag;
+		$this->_element = $element;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        // depends on the underlying type
-        return $this->_element->isConstructed();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		// depends on the underlying type
+		return $this->_element->isConstructed();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        return $this->_element->_encodedContentDER();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return $this->_element->_encodedContentDER();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
-     * @return UnspecifiedType
-     */
-    public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
-    {
-        $this->_element->expectType($tag);
-        if ($this->_element->typeClass() != $class) {
-            throw new \UnexpectedValueException(
-                sprintf("Type class %s expected, got %s.",
-                    Identifier::classToName($class),
-                    Identifier::classToName($this->_element->typeClass())));
-        }
-        return new UnspecifiedType($this->_element);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
+	 * @return UnspecifiedType
+	 */
+	public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		$this->_element->expectType($tag);
+		if ($this->_element->typeClass() != $class) {
+			throw new \UnexpectedValueException(
+				sprintf("Type class %s expected, got %s.",
+					Identifier::classToName($class),
+					Identifier::classToName($this->_element->typeClass())));
+		}
+		return new UnspecifiedType($this->_element);
+	}
 }

lib/ASN1/Type/Tagged/ExplicitlyTaggedType.php

Indentation +43 added lines, -43 removed lines

@@ -14,51 +14,51 @@
  * is not changed.
  */
 class ExplicitlyTaggedType extends ContextSpecificTaggedType implements 
-    ExplicitTagging
+	ExplicitTagging
 {
-    /**
-     * Constructor.
-     *
-     * @param int $tag Tag number
-     * @param Element $element Wrapped element
-     */
-    public function __construct(int $tag, Element $element)
-    {
-        $this->_typeTag = $tag;
-        $this->_element = $element;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $tag Tag number
+	 * @param Element $element Wrapped element
+	 */
+	public function __construct(int $tag, Element $element)
+	{
+		$this->_typeTag = $tag;
+		$this->_element = $element;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return true;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return true;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        return $this->_element->toDER();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return $this->_element->toDER();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
-     * @return UnspecifiedType
-     */
-    public function explicit($expectedTag = null): UnspecifiedType
-    {
-        if (isset($expectedTag)) {
-            $this->_element->expectType($expectedTag);
-        }
-        return new UnspecifiedType($this->_element);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
+	 * @return UnspecifiedType
+	 */
+	public function explicit($expectedTag = null): UnspecifiedType
+	{
+		if (isset($expectedTag)) {
+			$this->_element->expectType($expectedTag);
+		}
+		return new UnspecifiedType($this->_element);
+	}
 }