sop / asn1

lib/ASN1/Type/TimeType.php

Indentation +77 added lines, -77 removed lines

@@ -9,87 +9,87 @@
  */
 abstract class TimeType extends Element
 {
-    /**
-     * UTC timezone.
-     *
-     * @var string
-     */
-    const TZ_UTC = "UTC";
+	/**
+	 * UTC timezone.
+	 *
+	 * @var string
+	 */
+	const TZ_UTC = "UTC";
     
-    /**
-     * Date and time.
-     *
-     * @var \DateTimeImmutable $_dateTime
-     */
-    protected $_dateTime;
+	/**
+	 * Date and time.
+	 *
+	 * @var \DateTimeImmutable $_dateTime
+	 */
+	protected $_dateTime;
     
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_dateTime = $dt;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_dateTime = $dt;
+	}
     
-    /**
-     * Initialize from datetime string.
-     *
-     * @param string $time Time string
-     * @param string|null $tz Timezone, if null use default.
-     * @throws \RuntimeException
-     * @return self
-     */
-    public static function fromString($time, $tz = null)
-    {
-        try {
-            if (!isset($tz)) {
-                $tz = date_default_timezone_get();
-            }
-            return new static(
-                new \DateTimeImmutable($time, self::_createTimeZone($tz)));
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                "Failed to create DateTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
-        }
-    }
+	/**
+	 * Initialize from datetime string.
+	 *
+	 * @param string $time Time string
+	 * @param string|null $tz Timezone, if null use default.
+	 * @throws \RuntimeException
+	 * @return self
+	 */
+	public static function fromString($time, $tz = null)
+	{
+		try {
+			if (!isset($tz)) {
+				$tz = date_default_timezone_get();
+			}
+			return new static(
+				new \DateTimeImmutable($time, self::_createTimeZone($tz)));
+		} catch (\Exception $e) {
+			throw new \RuntimeException(
+				"Failed to create DateTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
+		}
+	}
     
-    /**
-     * Get the date and time.
-     *
-     * @return \DateTimeImmutable
-     */
-    public function dateTime()
-    {
-        return $this->_dateTime;
-    }
+	/**
+	 * Get the date and time.
+	 *
+	 * @return \DateTimeImmutable
+	 */
+	public function dateTime()
+	{
+		return $this->_dateTime;
+	}
     
-    /**
-     * Create DateTimeZone object from string.
-     *
-     * @param string $tz
-     * @throws \UnexpectedValueException If timezone is invalid
-     * @return \DateTimeZone
-     */
-    protected static function _createTimeZone($tz)
-    {
-        try {
-            return new \DateTimeZone($tz);
-        } catch (\Exception $e) {
-            throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
-        }
-    }
+	/**
+	 * Create DateTimeZone object from string.
+	 *
+	 * @param string $tz
+	 * @throws \UnexpectedValueException If timezone is invalid
+	 * @return \DateTimeZone
+	 */
+	protected static function _createTimeZone($tz)
+	{
+		try {
+			return new \DateTimeZone($tz);
+		} catch (\Exception $e) {
+			throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
+		}
+	}
     
-    /**
-     * Get last error caused by DateTimeImmutable.
-     *
-     * @return string
-     */
-    protected static function _getLastDateTimeImmutableErrorsStr()
-    {
-        $errors = \DateTimeImmutable::getLastErrors()["errors"];
-        return implode(", ", $errors);
-    }
+	/**
+	 * Get last error caused by DateTimeImmutable.
+	 *
+	 * @return string
+	 */
+	protected static function _getLastDateTimeImmutableErrorsStr()
+	{
+		$errors = \DateTimeImmutable::getLastErrors()["errors"];
+		return implode(", ", $errors);
+	}
 }

lib/ASN1/Type/Constructed/Sequence.php

Indentation +10 added lines, -10 removed lines

@@ -10,14 +10,14 @@
  */
 class Sequence extends Structure
 {
-    /**
-     * Constructor
-     *
-     * @param Element ...$elements Any number of elements
-     */
-    public function __construct(Element ...$elements)
-    {
-        $this->_typeTag = self::TYPE_SEQUENCE;
-        parent::__construct(...$elements);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param Element ...$elements Any number of elements
+	 */
+	public function __construct(Element ...$elements)
+	{
+		$this->_typeTag = self::TYPE_SEQUENCE;
+		parent::__construct(...$elements);
+	}
 }

lib/ASN1/Type/Constructed/Set.php

Indentation +48 added lines, -48 removed lines

@@ -10,54 +10,54 @@
  */
 class Set extends Structure
 {
-    /**
-     * Constructor
-     *
-     * @param Element ...$elements Any number of elements
-     */
-    public function __construct(Element ...$elements)
-    {
-        $this->_typeTag = self::TYPE_SET;
-        parent::__construct(...$elements);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param Element ...$elements Any number of elements
+	 */
+	public function __construct(Element ...$elements)
+	{
+		$this->_typeTag = self::TYPE_SET;
+		parent::__construct(...$elements);
+	}
     
-    /**
-     * Sort by canonical ascending order.
-     * Used for DER encoding of SET type.
-     *
-     * @return self
-     */
-    public function sortedSet()
-    {
-        $obj = clone $this;
-        usort($obj->_elements,
-            function (Element $a, Element $b) {
-                if ($a->typeClass() != $b->typeClass()) {
-                    return $a->typeClass() < $b->typeClass() ? -1 : 1;
-                }
-                if ($a->tag() == $b->tag()) {
-                    return 0;
-                }
-                return $a->tag() < $b->tag() ? -1 : 1;
-            });
-        return $obj;
-    }
+	/**
+	 * Sort by canonical ascending order.
+	 * Used for DER encoding of SET type.
+	 *
+	 * @return self
+	 */
+	public function sortedSet()
+	{
+		$obj = clone $this;
+		usort($obj->_elements,
+			function (Element $a, Element $b) {
+				if ($a->typeClass() != $b->typeClass()) {
+					return $a->typeClass() < $b->typeClass() ? -1 : 1;
+				}
+				if ($a->tag() == $b->tag()) {
+					return 0;
+				}
+				return $a->tag() < $b->tag() ? -1 : 1;
+			});
+		return $obj;
+	}
     
-    /**
-     * Sort by encoding ascending order.
-     * Used for DER encoding of SET OF type.
-     *
-     * @return self
-     */
-    public function sortedSetOf()
-    {
-        $obj = clone $this;
-        usort($obj->_elements,
-            function (Element $a, Element $b) {
-                $a_der = $a->toDER();
-                $b_der = $b->toDER();
-                return strcmp($a_der, $b_der);
-            });
-        return $obj;
-    }
+	/**
+	 * Sort by encoding ascending order.
+	 * Used for DER encoding of SET OF type.
+	 *
+	 * @return self
+	 */
+	public function sortedSetOf()
+	{
+		$obj = clone $this;
+		usort($obj->_elements,
+			function (Element $a, Element $b) {
+				$a_der = $a->toDER();
+				$b_der = $b->toDER();
+				return strcmp($a_der, $b_der);
+			});
+		return $obj;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $obj = clone $this;
         usort($obj->_elements,
-            function (Element $a, Element $b) {
+            function(Element $a, Element $b) {
                 if ($a->typeClass() != $b->typeClass()) {
                     return $a->typeClass() < $b->typeClass() ? -1 : 1;
                 }
@@ -53,7 +53,7 @@ 
     {
         $obj = clone $this;
         usort($obj->_elements,
-            function (Element $a, Element $b) {
+            function(Element $a, Element $b) {
                 $a_der = $a->toDER();
                 $b_der = $b->toDER();
                 return strcmp($a_der, $b_der);

lib/ASN1/Type/PrimitiveType.php

Indentation +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@
  */
 trait PrimitiveType
 {
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return boolean
-     */
-    public function isConstructed()
-    {
-        return false;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return boolean
+	 */
+	public function isConstructed()
+	{
+		return false;
+	}
 }

lib/ASN1/Type/Tagged/ExplicitlyTaggedType.php

Indentation +42 added lines, -42 removed lines

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

lib/ASN1/Type/Tagged/ContextSpecificTaggedType.php

Indentation +15 added lines, -15 removed lines

@@ -10,20 +10,20 @@
  */
 abstract class ContextSpecificTaggedType extends TaggedType
 {
-    /**
-     * Wrapped element.
-     *
-     * @var \ASN1\Element $_element
-     */
-    protected $_element;
+	/**
+	 * Wrapped element.
+	 *
+	 * @var \ASN1\Element $_element
+	 */
+	protected $_element;
     
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass()
-    {
-        return Identifier::CLASS_CONTEXT_SPECIFIC;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass()
+	{
+		return Identifier::CLASS_CONTEXT_SPECIFIC;
+	}
 }

lib/ASN1/Type/Tagged/ImplicitlyTaggedType.php

Indentation +47 added lines, -47 removed lines

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

lib/ASN1/Type/Tagged/ExplicitTagging.php

Indentation +11 added lines, -11 removed lines

@@ -9,15 +9,15 @@
  */
 interface ExplicitTagging extends ElementBase
 {
-    /**
-     * Get explicitly tagged wrapped element.
-     *
-     * NOTE! Expectation checking is deprecated and shall be done
-     * with UnspecifiedType.
-     *
-     * @param int|null $expectedTag Expected tag of the underlying type
-     * @throws \UnexpectedValueException If expectation fails
-     * @return \ASN1\Type\UnspecifiedType
-     */
-    public function explicit($expectedTag = null);
+	/**
+	 * Get explicitly tagged wrapped element.
+	 *
+	 * NOTE! Expectation checking is deprecated and shall be done
+	 * with UnspecifiedType.
+	 *
+	 * @param int|null $expectedTag Expected tag of the underlying type
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return \ASN1\Type\UnspecifiedType
+	 */
+	public function explicit($expectedTag = null);
 }

lib/ASN1/Type/Tagged/DERTaggedType.php

Indentation +91 added lines, -91 removed lines

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