sop / asn1

lib/ASN1/Type/Primitive/Integer.php

Indentation +148 added lines, -148 removed lines

@@ -17,161 +17,161 @@
  */
 class Integer extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * The number.
-     *
-     * @var BigInt
-     */
-    private $_number;
+	/**
+	 * The number.
+	 *
+	 * @var BigInt
+	 */
+	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 = new BigInt($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 = new BigInt($number);
+	}
     
-    /**
-     * Get the number as a base 10.
-     *
-     * @return string Integer as a string
-     */
-    public function number(): string
-    {
-        return $this->_number->base10();
-    }
+	/**
+	 * Get the number as a base 10.
+	 *
+	 * @return string Integer as a string
+	 */
+	public function number(): string
+	{
+		return $this->_number->base10();
+	}
     
-    /**
-     * Get the number as an integer type.
-     * 
-     * @return int
-     */
-    public function intNumber(): int
-    {
-        return $this->_number->intVal();
-    }
+	/**
+	 * Get the number as an integer type.
+	 * 
+	 * @return int
+	 */
+	public function intNumber(): int
+	{
+		return $this->_number->intVal();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $num = $this->_number->gmpObj();
-        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 = $this->_number->gmpObj();
+		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): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $bytes = substr($data, $idx, $length);
-        $idx += $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));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$bytes = substr($data, $idx, $length);
+		$idx += $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 bool
-     */
-    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 bool
+	 */
+	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/Component/Length.php

Indentation +193 added lines, -193 removed lines

@@ -13,206 +13,206 @@
  */
 class Length implements Encodable
 {
-    /**
-     * Length.
-     *
-     * @var BigInt
-     */
-    private $_length;
+	/**
+	 * Length.
+	 *
+	 * @var BigInt
+	 */
+	private $_length;
     
-    /**
-     * Whether length is indefinite.
-     *
-     * @var boolean
-     */
-    private $_indefinite;
+	/**
+	 * Whether length is indefinite.
+	 *
+	 * @var boolean
+	 */
+	private $_indefinite;
     
-    /**
-     * Constructor.
-     *
-     * @param int|string $length Length
-     * @param boolean $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 boolean $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 ? $offset : 0;
-        $datalen = strlen($data);
-        if ($idx >= $datalen) {
-            throw new DecodeException("Invalid offset.");
-        }
-        $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("Too many length octets.");
-                }
-                $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 ? $offset : 0;
+		$datalen = strlen($data);
+		if ($idx >= $datalen) {
+			throw new DecodeException("Invalid offset.");
+		}
+		$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("Too many length octets.");
+				}
+				$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.
-     *
-     * @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);
-        // DER encoding must have definite length (spec 10.1)
-        if ($length->isIndefinite()) {
-            throw new DecodeException("DER encoding must have definite length.");
-        }
-        // if certain length was expected
-        if (isset($expected) && $expected != $length->intLength()) {
-            throw new DecodeException(
-                sprintf("Expected length %d, got %d.", $expected,
-                    $length->intLength()));
-        }
-        // check that enough data is available
-        if (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.
+	 *
+	 * @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);
+		// DER encoding must have definite length (spec 10.1)
+		if ($length->isIndefinite()) {
+			throw new DecodeException("DER encoding must have definite length.");
+		}
+		// if certain length was expected
+		if (isset($expected) && $expected != $length->intLength()) {
+			throw new DecodeException(
+				sprintf("Expected length %d, got %d.", $expected,
+					$length->intLength()));
+		}
+		// check that enough data is available
+		if (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 boolean
-     */
-    public function isIndefinite(): bool
-    {
-        return $this->_indefinite;
-    }
+	/**
+	 * Whether length is indefinite.
+	 *
+	 * @return boolean
+	 */
+	public function isIndefinite(): bool
+	{
+		return $this->_indefinite;
+	}
 }

lib/ASN1/Util/BigInt.php

Indentation +94 added lines, -94 removed lines

@@ -6,106 +6,106 @@
 
 class BigInt
 {
-    /**
-     * Number as a base10 integer string.
-     *
-     * @var string
-     */
-    private $_num;
+	/**
+	 * Number as a base10 integer string.
+	 *
+	 * @var string
+	 */
+	private $_num;
     
-    /**
-     * Number as an integer type.
-     *
-     * @internal Lazily initialized
-     * @var int|null
-     */
-    private $_intNum;
+	/**
+	 * Number as an integer type.
+	 *
+	 * @internal Lazily initialized
+	 * @var int|null
+	 */
+	private $_intNum;
     
-    /**
-     * Constructor.
-     *
-     * @param string|int $num
-     */
-    public function __construct($num)
-    {
-        $this->_num = strval($num);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string|int $num
+	 */
+	public function __construct($num)
+	{
+		$this->_num = strval($num);
+	}
     
-    /**
-     * Get the number as a base10 integer string.
-     *
-     * @return string
-     */
-    public function base10(): string
-    {
-        return $this->_num;
-    }
+	/**
+	 * Get the number as a base10 integer string.
+	 *
+	 * @return string
+	 */
+	public function base10(): string
+	{
+		return $this->_num;
+	}
     
-    /**
-     * Get the number as an integer.
-     *
-     * @throws \RuntimeException If number overflows integer size
-     * @return int
-     */
-    public function intVal(): int
-    {
-        if (!isset($this->_intNum)) {
-            $num = gmp_init($this->_num, 10);
-            if (gmp_cmp($num, $this->_intMaxGmp()) > 0) {
-                throw new \RuntimeException("Integer overflow.");
-            }
-            if (gmp_cmp($num, $this->_intMinGmp()) < 0) {
-                throw new \RuntimeException("Integer underflow.");
-            }
-            $this->_intNum = gmp_intval($num);
-        }
-        return $this->_intNum;
-    }
+	/**
+	 * Get the number as an integer.
+	 *
+	 * @throws \RuntimeException If number overflows integer size
+	 * @return int
+	 */
+	public function intVal(): int
+	{
+		if (!isset($this->_intNum)) {
+			$num = gmp_init($this->_num, 10);
+			if (gmp_cmp($num, $this->_intMaxGmp()) > 0) {
+				throw new \RuntimeException("Integer overflow.");
+			}
+			if (gmp_cmp($num, $this->_intMinGmp()) < 0) {
+				throw new \RuntimeException("Integer underflow.");
+			}
+			$this->_intNum = gmp_intval($num);
+		}
+		return $this->_intNum;
+	}
     
-    /**
-     * Get the maximum integer value.
-     *
-     * @return \GMP
-     */
-    private function _intMaxGmp(): \GMP
-    {
-        static $gmp;
-        if (!isset($gmp)) {
-            $gmp = gmp_init(PHP_INT_MAX, 10);
-        }
-        return $gmp;
-    }
+	/**
+	 * Get the maximum integer value.
+	 *
+	 * @return \GMP
+	 */
+	private function _intMaxGmp(): \GMP
+	{
+		static $gmp;
+		if (!isset($gmp)) {
+			$gmp = gmp_init(PHP_INT_MAX, 10);
+		}
+		return $gmp;
+	}
     
-    /**
-     * Get the minimum integer value.
-     *
-     * @return \GMP
-     */
-    private function _intMinGmp(): \GMP
-    {
-        static $gmp;
-        if (!isset($gmp)) {
-            $gmp = gmp_init(PHP_INT_MIN, 10);
-        }
-        return $gmp;
-    }
+	/**
+	 * Get the minimum integer value.
+	 *
+	 * @return \GMP
+	 */
+	private function _intMinGmp(): \GMP
+	{
+		static $gmp;
+		if (!isset($gmp)) {
+			$gmp = gmp_init(PHP_INT_MIN, 10);
+		}
+		return $gmp;
+	}
     
-    /**
-     * Get the number as a GMP object.
-     *
-     * @return \GMP
-     */
-    public function gmpObj(): \GMP
-    {
-        return gmp_init($this->_num, 10);
-    }
+	/**
+	 * Get the number as a GMP object.
+	 *
+	 * @return \GMP
+	 */
+	public function gmpObj(): \GMP
+	{
+		return gmp_init($this->_num, 10);
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->base10();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->base10();
+	}
 }

lib/ASN1/Util/Flags.php

Indentation +129 added lines, -129 removed lines

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

lib/ASN1/DERData.php

Indentation +71 added lines, -71 removed lines

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

lib/ASN1/Type/Primitive/BitString.php

Indentation +181 added lines, -181 removed lines

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

lib/ASN1/Type/Primitive/ObjectIdentifier.php

Indentation +147 added lines, -147 removed lines

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

lib/ASN1/Type/TaggedType.php

Indentation +77 added lines, -77 removed lines

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

lib/ASN1/Type/TimeType.php

Indentation +77 added lines, -77 removed lines

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