sop / asn1

lib/ASN1/Component/Identifier.php

Indentation +269 added lines, -269 removed lines

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

lib/ASN1/Component/Length.php

Indentation +201 added lines, -201 removed lines

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

lib/ASN1/Type/Structure.php

Indentation +368 added lines, -368 removed lines

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

lib/ASN1/Type/Primitive/EOC.php

Indentation +34 added lines, -34 removed lines

@@ -16,41 +16,41 @@
  */
 class EOC extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->_typeTag = self::TYPE_EOC;
-    }
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->_typeTag = self::TYPE_EOC;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return '';
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return '';
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        if (!$identifier->isPrimitive()) {
-            throw new DecodeException("EOC value must be primitive.");
-        }
-        // EOC type has always zero length
-        Length::expectFromDER($data, $idx, 0);
-        $offset = $idx;
-        return new self();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		if (!$identifier->isPrimitive()) {
+			throw new DecodeException("EOC value must be primitive.");
+		}
+		// EOC type has always zero length
+		Length::expectFromDER($data, $idx, 0);
+		$offset = $idx;
+		return new self();
+	}
 }

lib/ASN1/Type/Tagged/DERTaggedType.php

Indentation +138 added lines, -138 removed lines

@@ -21,154 +21,154 @@
  * 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 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}
-     */
-    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;
+	}
     
-    /**
-     *
-     * @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
-    {
-        return substr($this->_data, $this->_valueOffset, $this->_valueLength);
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return substr($this->_data, $this->_valueOffset, $this->_valueLength);
+	}
     
-    /**
-     *
-     * {@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;
-        /** @var \ASN1\Feature\ElementBase $element */
-        $element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
-        return $element->asUnspecified();
-    }
+	/**
+	 *
+	 * {@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;
+		/** @var \ASN1\Feature\ElementBase $element */
+		$element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
+		return $element->asUnspecified();
+	}
     
-    /**
-     *
-     * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
-     * @return UnspecifiedType
-     */
-    public function explicit($expectedTag = null): UnspecifiedType
-    {
-        $idx = $this->_valueOffset;
-        $element = Element::fromDER($this->_data, $idx);
-        if (isset($expectedTag)) {
-            $element->expectType($expectedTag);
-        }
-        return $element->asUnspecified();
-    }
+	/**
+	 *
+	 * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
+	 * @return UnspecifiedType
+	 */
+	public function explicit($expectedTag = null): UnspecifiedType
+	{
+		$idx = $this->_valueOffset;
+		$element = Element::fromDER($this->_data, $idx);
+		if (isset($expectedTag)) {
+			$element->expectType($expectedTag);
+		}
+		return $element->asUnspecified();
+	}
 }

lib/ASN1/Type/TaggedType.php

Indentation +64 added lines, -64 removed lines

@@ -13,71 +13,71 @@
  */
 abstract class TaggedType extends Element
 {
-    /**
-     * 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/UnspecifiedType.php

Indentation +678 added lines, -678 removed lines

@@ -16,682 +16,682 @@
  */
 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 DER data.
-     *
-     * @param string $data DER encoded data
-     * @return self
-     */
-    public static function fromDER(string $data): self
-    {
-        return Element::fromDER($data)->asUnspecified();
-    }
-    
-    /**
-     * 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 an application specific type.
-     *
-     * @throws \UnexpectedValueException If element is not application specific
-     * @return \ASN1\Type\Tagged\ApplicationType
-     */
-    public function asApplication(): Tagged\ApplicationType
-    {
-        if (!$this->_element instanceof Tagged\ApplicationType) {
-            throw new \UnexpectedValueException(
-                "Application type expected, got " .
-                $this->_typeDescriptorString());
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a private tagged type.
-     *
-     * @throws \UnexpectedValueException If element is not using private tagging
-     * @return \ASN1\Type\Tagged\PrivateType
-     */
-    public function asPrivate(): Tagged\PrivateType
-    {
-        if (!$this->_element instanceof Tagged\PrivateType) {
-            throw new \UnexpectedValueException(
-                "Private type 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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 a constructed string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a constructed
-     *         string
-     * @return Constructed\ConstructedString
-     */
-    public function asConstructedString(): Constructed\ConstructedString
-    {
-        if (!$this->_element instanceof Constructed\ConstructedString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(
-                    Element::TYPE_CONSTRUCTED_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;
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     * @return UnspecifiedType
-     */
-    public function asUnspecified(): UnspecifiedType
-    {
-        return $this;
-    }
+	/**
+	 * The wrapped element.
+	 *
+	 * @var Element
+	 */
+	private $_element;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param Element $el
+	 */
+	public function __construct(Element $el)
+	{
+		$this->_element = $el;
+	}
+    
+	/**
+	 * Initialize from DER data.
+	 *
+	 * @param string $data DER encoded data
+	 * @return self
+	 */
+	public static function fromDER(string $data): self
+	{
+		return Element::fromDER($data)->asUnspecified();
+	}
+    
+	/**
+	 * 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 an application specific type.
+	 *
+	 * @throws \UnexpectedValueException If element is not application specific
+	 * @return \ASN1\Type\Tagged\ApplicationType
+	 */
+	public function asApplication(): Tagged\ApplicationType
+	{
+		if (!$this->_element instanceof Tagged\ApplicationType) {
+			throw new \UnexpectedValueException(
+				"Application type expected, got " .
+				$this->_typeDescriptorString());
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a private tagged type.
+	 *
+	 * @throws \UnexpectedValueException If element is not using private tagging
+	 * @return \ASN1\Type\Tagged\PrivateType
+	 */
+	public function asPrivate(): Tagged\PrivateType
+	{
+		if (!$this->_element instanceof Tagged\PrivateType) {
+			throw new \UnexpectedValueException(
+				"Private type 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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 \ASN1\Type\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 a constructed string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a constructed
+	 *         string
+	 * @return Constructed\ConstructedString
+	 */
+	public function asConstructedString(): Constructed\ConstructedString
+	{
+		if (!$this->_element instanceof Constructed\ConstructedString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(
+					Element::TYPE_CONSTRUCTED_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;
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return UnspecifiedType
+	 */
+	public function asUnspecified(): UnspecifiedType
+	{
+		return $this;
+	}
 }

lib/ASN1/Type/Constructed/ConstructedString.php

Indentation +101 added lines, -101 removed lines

@@ -15,112 +15,112 @@
  */
 class ConstructedString extends Structure implements Stringable
 {
-    /**
-     * Constructor.
-     *
-     * @internal Use create()
-     *          
-     * @param Element ...$elements Any number of elements
-     */
-    public function __construct(Element ...$elements)
-    {
-        parent::__construct(...$elements);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @internal Use create()
+	 *          
+	 * @param Element ...$elements Any number of elements
+	 */
+	public function __construct(Element ...$elements)
+	{
+		parent::__construct(...$elements);
+	}
     
-    /**
-     * Create from a list of string type elements
-     *
-     * All strings must have the same type.
-     *
-     * @param StringType ...$elements
-     * @throws \LogicException
-     * @return self
-     */
-    public static function create(StringType ...$elements): self
-    {
-        if (!count($elements)) {
-            throw new \LogicException(
-                'No elements, unable to determine type tag.');
-        }
-        $tag = $elements[0]->tag();
-        foreach ($elements as $el) {
-            if ($el->tag() !== $tag) {
-                throw new \LogicException(
-                    'All elements in constructed string must have the same type.');
-            }
-        }
-        return self::createWithTag($tag, ...$elements);
-    }
+	/**
+	 * Create from a list of string type elements
+	 *
+	 * All strings must have the same type.
+	 *
+	 * @param StringType ...$elements
+	 * @throws \LogicException
+	 * @return self
+	 */
+	public static function create(StringType ...$elements): self
+	{
+		if (!count($elements)) {
+			throw new \LogicException(
+				'No elements, unable to determine type tag.');
+		}
+		$tag = $elements[0]->tag();
+		foreach ($elements as $el) {
+			if ($el->tag() !== $tag) {
+				throw new \LogicException(
+					'All elements in constructed string must have the same type.');
+			}
+		}
+		return self::createWithTag($tag, ...$elements);
+	}
     
-    /**
-     * Create from strings with a given type tag.
-     *
-     * @param int $tag Type tag for the constructed string element
-     * @param StringType ...$elements Any number of elements
-     * @return self
-     */
-    public static function createWithTag(int $tag, StringType ...$elements)
-    {
-        $el = new self(...$elements);
-        $el->_typeTag = $tag;
-        return $el;
-    }
+	/**
+	 * Create from strings with a given type tag.
+	 *
+	 * @param int $tag Type tag for the constructed string element
+	 * @param StringType ...$elements Any number of elements
+	 * @return self
+	 */
+	public static function createWithTag(int $tag, StringType ...$elements)
+	{
+		$el = new self(...$elements);
+		$el->_typeTag = $tag;
+		return $el;
+	}
     
-    /**
-     * Get a list of strings in this structure.
-     *
-     * @return string[]
-     */
-    public function strings(): array
-    {
-        return array_map(function (StringType $el) {
-            return $el->string();
-        }, $this->_elements);
-    }
+	/**
+	 * Get a list of strings in this structure.
+	 *
+	 * @return string[]
+	 */
+	public function strings(): array
+	{
+		return array_map(function (StringType $el) {
+			return $el->string();
+		}, $this->_elements);
+	}
     
-    /**
-     * Get the contained strings concatenated together.
-     *
-     * @return string
-     */
-    public function concatenated(): string
-    {
-        return implode('', $this->strings());
-    }
+	/**
+	 * Get the contained strings concatenated together.
+	 *
+	 * @return string
+	 */
+	public function concatenated(): string
+	{
+		return implode('', $this->strings());
+	}
     
-    /**
-     * Get the contained strings concatenated together.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->concatenated();
-    }
+	/**
+	 * Get the contained strings concatenated together.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->concatenated();
+	}
     
-    /**
-     *
-     * @inheritdoc
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->concatenated();
-    }
+	/**
+	 *
+	 * @inheritdoc
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->concatenated();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        /** @var ConstructedString $type */
-        $type = forward_static_call_array([parent::class, __FUNCTION__],
-            [$identifier, $data, &$offset]);
-        $type->_typeTag = $identifier->intTag();
-        return $type;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		/** @var ConstructedString $type */
+		$type = forward_static_call_array([parent::class, __FUNCTION__],
+			[$identifier, $data, &$offset]);
+		$type->_typeTag = $identifier->intTag();
+		return $type;
+	}
 }

lib/ASN1/Type/StringType.php

Indentation +50 added lines, -50 removed lines

@@ -11,58 +11,58 @@
  */
 abstract class StringType extends Element implements Stringable
 {
-    /**
-     * String value.
-     *
-     * @var string $_string
-     */
-    protected $_string;
+	/**
+	 * String value.
+	 *
+	 * @var string $_string
+	 */
+	protected $_string;
     
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(string $string)
-    {
-        if (!$this->_validateString($string)) {
-            throw new \InvalidArgumentException(
-                sprintf("Not a valid %s string.",
-                    self::tagToName($this->_typeTag)));
-        }
-        $this->_string = $string;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct(string $string)
+	{
+		if (!$this->_validateString($string)) {
+			throw new \InvalidArgumentException(
+				sprintf("Not a valid %s string.",
+					self::tagToName($this->_typeTag)));
+		}
+		$this->_string = $string;
+	}
     
-    /**
-     * Get the string value.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_string;
-    }
+	/**
+	 * Get the string value.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_string;
+	}
     
-    /**
-     *
-     * @inheritdoc
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->_string;
-    }
+	/**
+	 *
+	 * @inheritdoc
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->_string;
+	}
     
-    /**
-     * Check whether string is valid for the concrete type.
-     *
-     * @param string $string
-     * @return bool
-     */
-    protected function _validateString(string $string): bool
-    {
-        // Override in derived classes
-        return true;
-    }
+	/**
+	 * Check whether string is valid for the concrete type.
+	 *
+	 * @param string $string
+	 * @return bool
+	 */
+	protected function _validateString(string $string): bool
+	{
+		// Override in derived classes
+		return true;
+	}
 }