sop / asn1

lib/ASN1/Type/UniversalClass.php

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@
  */
 trait UniversalClass
 {
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return Identifier::CLASS_UNIVERSAL;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return Identifier::CLASS_UNIVERSAL;
+	}
 }

lib/ASN1/Type/Constructed/Set.php

Indentation +48 added lines, -48 removed lines

@@ -12,54 +12,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;
+	}
 }

lib/ASN1/Type/Constructed/Sequence.php

Indentation +10 added lines, -10 removed lines

@@ -12,14 +12,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/Primitive/ObjectIdentifier.php

Indentation +147 added lines, -147 removed lines

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

lib/ASN1/Type/Primitive/Integer.php

Indentation +142 added lines, -142 removed lines

@@ -15,155 +15,155 @@
  */
 class Integer extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Number as a base 10.
-     *
-     * @var int|string
-     */
-    private $_number;
+	/**
+	 * Number as a base 10.
+	 *
+	 * @var int|string
+	 */
+	private $_number;
     
-    /**
-     * Constructor.
-     *
-     * @param int|string $number Base 10 integer
-     */
-    public function __construct($number)
-    {
-        $this->_typeTag = self::TYPE_INTEGER;
-        if (!self::_validateNumber($number)) {
-            $var = is_scalar($number) ? strval($number) : gettype($number);
-            throw new \InvalidArgumentException("'$var' is not a valid number.");
-        }
-        $this->_number = $number;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $number Base 10 integer
+	 */
+	public function __construct($number)
+	{
+		$this->_typeTag = self::TYPE_INTEGER;
+		if (!self::_validateNumber($number)) {
+			$var = is_scalar($number) ? strval($number) : gettype($number);
+			throw new \InvalidArgumentException("'$var' is not a valid number.");
+		}
+		$this->_number = $number;
+	}
     
-    /**
-     * Get the number as a base 10.
-     *
-     * @return int|string
-     */
-    public function number()
-    {
-        return $this->_number;
-    }
+	/**
+	 * Get the number as a base 10.
+	 *
+	 * @return int|string
+	 */
+	public function number()
+	{
+		return $this->_number;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $num = gmp_init($this->_number, 10);
-        switch (gmp_sign($num)) {
-            // positive
-            case 1:
-                return self::_encodePositiveInteger($num);
-            // negative
-            case -1:
-                return self::_encodeNegativeInteger($num);
-        }
-        // zero
-        return "\0";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$num = gmp_init($this->_number, 10);
+		switch (gmp_sign($num)) {
+			// positive
+			case 1:
+				return self::_encodePositiveInteger($num);
+			// negative
+			case -1:
+				return self::_encodeNegativeInteger($num);
+		}
+		// zero
+		return "\0";
+	}
     
-    /**
-     * Encode positive integer to DER content.
-     *
-     * @param \GMP|resource $num
-     * @return string
-     */
-    private static function _encodePositiveInteger(\GMP $num): string
-    {
-        $bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        // if first bit is 1, prepend full zero byte
-        // to represent positive two's complement
-        if (ord($bin[0]) & 0x80) {
-            $bin = chr(0x00) . $bin;
-        }
-        return $bin;
-    }
+	/**
+	 * Encode positive integer to DER content.
+	 *
+	 * @param \GMP|resource $num
+	 * @return string
+	 */
+	private static function _encodePositiveInteger(\GMP $num): string
+	{
+		$bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		// if first bit is 1, prepend full zero byte
+		// to represent positive two's complement
+		if (ord($bin[0]) & 0x80) {
+			$bin = chr(0x00) . $bin;
+		}
+		return $bin;
+	}
     
-    /**
-     * Encode negative integer to DER content.
-     *
-     * @param \GMP|resource $num
-     * @return string
-     */
-    private static function _encodeNegativeInteger(\GMP $num): string
-    {
-        $num = gmp_abs($num);
-        // compute number of bytes required
-        $width = 1;
-        if ($num > 128) {
-            $tmp = $num;
-            do {
-                $width++;
-                $tmp >>= 8;
-            } while ($tmp > 128);
-        }
-        // compute two's complement 2^n - x
-        $num = gmp_pow("2", 8 * $width) - $num;
-        $bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        // if first bit is 0, prepend full inverted byte
-        // to represent negative two's complement
-        if (!(ord($bin[0]) & 0x80)) {
-            $bin = chr(0xff) . $bin;
-        }
-        return $bin;
-    }
+	/**
+	 * Encode negative integer to DER content.
+	 *
+	 * @param \GMP|resource $num
+	 * @return string
+	 */
+	private static function _encodeNegativeInteger(\GMP $num): string
+	{
+		$num = gmp_abs($num);
+		// compute number of bytes required
+		$width = 1;
+		if ($num > 128) {
+			$tmp = $num;
+			do {
+				$width++;
+				$tmp >>= 8;
+			} while ($tmp > 128);
+		}
+		// compute two's complement 2^n - x
+		$num = gmp_pow("2", 8 * $width) - $num;
+		$bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		// if first bit is 0, prepend full inverted byte
+		// to represent negative two's complement
+		if (!(ord($bin[0]) & 0x80)) {
+			$bin = chr(0xff) . $bin;
+		}
+		return $bin;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset)
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        if (gmp_cmp(gmp_init($length->length(),10), gmp_init(PHP_INT_MAX, 10)) >= 0) {
-            throw new \RuntimeException("Integer length too large");
-        }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset)
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		if (gmp_cmp(gmp_init($length->length(),10), gmp_init(PHP_INT_MAX, 10)) >= 0) {
+			throw new \RuntimeException("Integer length too large");
+		}
 
-        $bytes = substr($data, $idx, (int) $length->length());
-        $idx += $length->length();
-        $neg = ord($bytes[0]) & 0x80;
-        // negative, apply inversion of two's complement
-        if ($neg) {
-            $len = strlen($bytes);
-            for ($i = 0; $i < $len; $i++) {
-                $bytes[$i] = ~$bytes[$i];
-            }
-        }
-        $num = gmp_init(bin2hex($bytes), 16);
-        // negative, apply addition of two's complement
-        // and produce negative result
-        if ($neg) {
-            $num = gmp_neg($num + 1);
-        }
-        $offset = $idx;
-        // late static binding since enumerated extends integer type
-        return new static(gmp_strval($num, 10));
-    }
+		$bytes = substr($data, $idx, (int) $length->length());
+		$idx += $length->length();
+		$neg = ord($bytes[0]) & 0x80;
+		// negative, apply inversion of two's complement
+		if ($neg) {
+			$len = strlen($bytes);
+			for ($i = 0; $i < $len; $i++) {
+				$bytes[$i] = ~$bytes[$i];
+			}
+		}
+		$num = gmp_init(bin2hex($bytes), 16);
+		// negative, apply addition of two's complement
+		// and produce negative result
+		if ($neg) {
+			$num = gmp_neg($num + 1);
+		}
+		$offset = $idx;
+		// late static binding since enumerated extends integer type
+		return new static(gmp_strval($num, 10));
+	}
     
-    /**
-     * Test that number is valid for this context.
-     *
-     * @param mixed $num
-     * @return boolean
-     */
-    private static function _validateNumber($num): bool
-    {
-        if (is_int($num)) {
-            return true;
-        }
-        if (is_string($num) && preg_match('/-?\d+/', $num)) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Test that number is valid for this context.
+	 *
+	 * @param mixed $num
+	 * @return boolean
+	 */
+	private static function _validateNumber($num): bool
+	{
+		if (is_int($num)) {
+			return true;
+		}
+		if (is_string($num) && preg_match('/-?\d+/', $num)) {
+			return true;
+		}
+		return false;
+	}
 }

lib/ASN1/Type/Primitive/BitString.php

Indentation +181 added lines, -181 removed lines

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

lib/ASN1/Type/Primitive/GeneralString.php

Indentation +20 added lines, -20 removed lines

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

lib/ASN1/Type/Primitive/Boolean.php

Indentation +55 added lines, -55 removed lines

@@ -16,64 +16,64 @@
  */
 class Boolean extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Value.
-     *
-     * @var bool
-     */
-    private $_bool;
+	/**
+	 * Value.
+	 *
+	 * @var bool
+	 */
+	private $_bool;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $bool
-     */
-    public function __construct(bool $bool)
-    {
-        $this->_typeTag = self::TYPE_BOOLEAN;
-        $this->_bool = $bool;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $bool
+	 */
+	public function __construct(bool $bool)
+	{
+		$this->_typeTag = self::TYPE_BOOLEAN;
+		$this->_bool = $bool;
+	}
     
-    /**
-     * Get the value.
-     *
-     * @return bool
-     */
-    public function value(): bool
-    {
-        return $this->_bool;
-    }
+	/**
+	 * Get the value.
+	 *
+	 * @return bool
+	 */
+	public function value(): bool
+	{
+		return $this->_bool;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return $this->_bool ? chr(0xff) : chr(0);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return $this->_bool ? chr(0xff) : chr(0);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset)
-    {
-        $idx = $offset;
-        Length::expectFromDER($data, $idx, 1);
-        $byte = ord($data[$idx++]);
-        if ($byte !== 0) {
-            if ($byte != 0xff) {
-                throw new DecodeException(
-                    "DER encoded boolean true must have all bits set to 1.");
-            }
-        }
-        $offset = $idx;
-        return new self($byte !== 0);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset)
+	{
+		$idx = $offset;
+		Length::expectFromDER($data, $idx, 1);
+		$byte = ord($data[$idx++]);
+		if ($byte !== 0) {
+			if ($byte != 0xff) {
+				throw new DecodeException(
+					"DER encoded boolean true must have all bits set to 1.");
+			}
+		}
+		$offset = $idx;
+		return new self($byte !== 0);
+	}
 }

lib/ASN1/Type/Primitive/OctetString.php

Indentation +11 added lines, -11 removed lines

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