sop / asn1

lib/ASN1/Type/Primitive/Real.php

Doc Comments +1 added lines, -1 removed lines

@@ -271,7 +271,7 @@
     /**
      * Test that number is valid for this context.
      *
-     * @param mixed $num
+     * @param string $num
      * @return boolean
      */
     private static function _validateNumber($num)

Indentation +250 added lines, -250 removed lines

@@ -14,271 +14,271 @@
  */
 class Real extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Regex pattern to parse NR3 form number conforming to DER.
-     *
-     * @var string
-     */
-    const NR3_REGEX = '/^(-?)(\d+)?\.E([+\-]?\d+)$/';
+	/**
+	 * Regex pattern to parse NR3 form number conforming to DER.
+	 *
+	 * @var string
+	 */
+	const NR3_REGEX = '/^(-?)(\d+)?\.E([+\-]?\d+)$/';
     
-    /**
-     * Regex pattern to parse PHP exponent number format.
-     *
-     * @link http://php.net/manual/en/language.types.float.php
-     * @var string
-     */
-    const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */
-        '([+\-]?'. // sign
-        '(?:'.
-            '\d+'. // LNUM
-            '|'.
-            '(?:\d*\.\d+|\d+\.\d*)'. // DNUM
-        '))[eE]'.
-        '([+\-]?\d+)'. // exponent
-    '$/'; /* @formatter:on */
+	/**
+	 * Regex pattern to parse PHP exponent number format.
+	 *
+	 * @link http://php.net/manual/en/language.types.float.php
+	 * @var string
+	 */
+	const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */
+		'([+\-]?'. // sign
+		'(?:'.
+			'\d+'. // LNUM
+			'|'.
+			'(?:\d*\.\d+|\d+\.\d*)'. // DNUM
+		'))[eE]'.
+		'([+\-]?\d+)'. // exponent
+	'$/'; /* @formatter:on */
     
-    /**
-     * Number zero represented in NR3 form.
-     *
-     * @var string
-     */
-    const NR3_ZERO = ".E+0";
+	/**
+	 * Number zero represented in NR3 form.
+	 *
+	 * @var string
+	 */
+	const NR3_ZERO = ".E+0";
     
-    /**
-     * Number in NR3 form.
-     *
-     * @var string
-     */
-    private $_number;
+	/**
+	 * Number in NR3 form.
+	 *
+	 * @var string
+	 */
+	private $_number;
     
-    /**
-     * Constructor.
-     *
-     * @param string $number Number in NR3 form.
-     */
-    public function __construct($number)
-    {
-        $this->_typeTag = self::TYPE_REAL;
-        if (!self::_validateNumber($number)) {
-            throw new \InvalidArgumentException(
-                "'$number' is not a valid NR3 form real.");
-        }
-        $this->_number = $number;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $number Number in NR3 form.
+	 */
+	public function __construct($number)
+	{
+		$this->_typeTag = self::TYPE_REAL;
+		if (!self::_validateNumber($number)) {
+			throw new \InvalidArgumentException(
+				"'$number' is not a valid NR3 form real.");
+		}
+		$this->_number = $number;
+	}
     
-    /**
-     * Initialize from float.
-     *
-     * @param float $number
-     * @return self
-     */
-    public static function fromFloat($number)
-    {
-        return new self(self::_decimalToNR3(strval($number)));
-    }
+	/**
+	 * Initialize from float.
+	 *
+	 * @param float $number
+	 * @return self
+	 */
+	public static function fromFloat($number)
+	{
+		return new self(self::_decimalToNR3(strval($number)));
+	}
     
-    /**
-     * Get number as a float.
-     *
-     * @return float
-     */
-    public function float()
-    {
-        return self::_nr3ToDecimal($this->_number);
-    }
+	/**
+	 * Get number as a float.
+	 *
+	 * @return float
+	 */
+	public function float()
+	{
+		return self::_nr3ToDecimal($this->_number);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER()
-    {
-        /* if the real value is the value zero, there shall be no contents
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER()
+	{
+		/* if the real value is the value zero, there shall be no contents
          octets in the encoding. (X.690 07-2002, section 8.5.2) */
-        if (self::NR3_ZERO == $this->_number) {
-            return "";
-        }
-        // encode in NR3 decimal encoding
-        $data = chr(0x03) . $this->_number;
-        return $data;
-    }
+		if (self::NR3_ZERO == $this->_number) {
+			return "";
+		}
+		// encode in NR3 decimal encoding
+		$data = chr(0x03) . $this->_number;
+		return $data;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, $data,
-        &$offset)
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        // if length is zero, value is zero (spec 8.5.2)
-        if (!$length->length()) {
-            $obj = new self(self::NR3_ZERO);
-        } else {
-            $bytes = substr($data, $idx, $length->length());
-            $byte = ord($bytes[0]);
-            if (0x80 & $byte) { // bit 8 = 1
-                $obj = self::_decodeBinaryEncoding($bytes);
-            } else if ($byte >> 6 == 0x00) { // bit 8 = 0, bit 7 = 0
-                $obj = self::_decodeDecimalEncoding($bytes);
-            } else { // bit 8 = 0, bit 7 = 1
-                $obj = self::_decodeSpecialRealValue($bytes);
-            }
-        }
-        $offset = $idx + $length->length();
-        return $obj;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, $data,
+		&$offset)
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		// if length is zero, value is zero (spec 8.5.2)
+		if (!$length->length()) {
+			$obj = new self(self::NR3_ZERO);
+		} else {
+			$bytes = substr($data, $idx, $length->length());
+			$byte = ord($bytes[0]);
+			if (0x80 & $byte) { // bit 8 = 1
+				$obj = self::_decodeBinaryEncoding($bytes);
+			} else if ($byte >> 6 == 0x00) { // bit 8 = 0, bit 7 = 0
+				$obj = self::_decodeDecimalEncoding($bytes);
+			} else { // bit 8 = 0, bit 7 = 1
+				$obj = self::_decodeSpecialRealValue($bytes);
+			}
+		}
+		$offset = $idx + $length->length();
+		return $obj;
+	}
     
-    /**
-     *
-     * @todo Implement
-     * @param string $data
-     */
-    protected static function _decodeBinaryEncoding($data)
-    {
-        throw new \RuntimeException(
-            "Binary encoding of REAL is not implemented.");
-    }
+	/**
+	 *
+	 * @todo Implement
+	 * @param string $data
+	 */
+	protected static function _decodeBinaryEncoding($data)
+	{
+		throw new \RuntimeException(
+			"Binary encoding of REAL is not implemented.");
+	}
     
-    /**
-     *
-     * @param string $data
-     * @throws \RuntimeException
-     * @return \ASN1\Type\Primitive\Real
-     */
-    protected static function _decodeDecimalEncoding($data)
-    {
-        $nr = ord($data[0]) & 0x03;
-        if ($nr != 0x03) {
-            throw new \RuntimeException("Only NR3 form supported.");
-        }
-        $str = substr($data, 1);
-        return new self($str);
-    }
+	/**
+	 *
+	 * @param string $data
+	 * @throws \RuntimeException
+	 * @return \ASN1\Type\Primitive\Real
+	 */
+	protected static function _decodeDecimalEncoding($data)
+	{
+		$nr = ord($data[0]) & 0x03;
+		if ($nr != 0x03) {
+			throw new \RuntimeException("Only NR3 form supported.");
+		}
+		$str = substr($data, 1);
+		return new self($str);
+	}
     
-    /**
-     *
-     * @todo Implement
-     * @param string $data
-     */
-    protected static function _decodeSpecialRealValue($data)
-    {
-        if (strlen($data) != 1) {
-            throw new DecodeException(
-                "SpecialRealValue must have one content octet.");
-        }
-        $byte = ord($data[0]);
-        if ($byte == 0x40) { // positive infinity
-            throw new \RuntimeException("PLUS-INFINITY not supported.");
-        } else if ($byte == 0x41) { // negative infinity
-            throw new \RuntimeException("MINUS-INFINITY not supported.");
-        } else {
-            throw new DecodeException("Invalid SpecialRealValue encoding.");
-        }
-    }
+	/**
+	 *
+	 * @todo Implement
+	 * @param string $data
+	 */
+	protected static function _decodeSpecialRealValue($data)
+	{
+		if (strlen($data) != 1) {
+			throw new DecodeException(
+				"SpecialRealValue must have one content octet.");
+		}
+		$byte = ord($data[0]);
+		if ($byte == 0x40) { // positive infinity
+			throw new \RuntimeException("PLUS-INFINITY not supported.");
+		} else if ($byte == 0x41) { // negative infinity
+			throw new \RuntimeException("MINUS-INFINITY not supported.");
+		} else {
+			throw new DecodeException("Invalid SpecialRealValue encoding.");
+		}
+	}
     
-    /**
-     * Convert decimal number string to NR3 form.
-     *
-     * @param string $str
-     * @return string
-     */
-    private static function _decimalToNR3($str)
-    {
-        // if number is in exponent form
-        if (preg_match(self::PHP_EXPONENT_DNUM, $str, $match)) {
-            $parts = explode(".", $match[1]);
-            $m = ltrim($parts[0], "0");
-            $e = intval($match[2]);
-            // if mantissa had decimals
-            if (count($parts) == 2) {
-                $d = rtrim($parts[1], "0");
-                $e -= strlen($d);
-                $m .= $d;
-            }
-        } else {
-            // explode from decimal
-            $parts = explode(".", $str);
-            $m = ltrim($parts[0], "0");
-            // if number had decimals
-            if (count($parts) == 2) {
-                // exponent is negative number of the decimals
-                $e = -strlen($parts[1]);
-                // append decimals to the mantissa
-                $m .= $parts[1];
-            } else {
-                $e = 0;
-            }
-            // shift trailing zeroes from the mantissa to the exponent
-            while (substr($m, -1) === "0") {
-                $e++;
-                $m = substr($m, 0, -1);
-            }
-        }
-        /* if exponent is zero, it must be prefixed with a "+" sign
+	/**
+	 * Convert decimal number string to NR3 form.
+	 *
+	 * @param string $str
+	 * @return string
+	 */
+	private static function _decimalToNR3($str)
+	{
+		// if number is in exponent form
+		if (preg_match(self::PHP_EXPONENT_DNUM, $str, $match)) {
+			$parts = explode(".", $match[1]);
+			$m = ltrim($parts[0], "0");
+			$e = intval($match[2]);
+			// if mantissa had decimals
+			if (count($parts) == 2) {
+				$d = rtrim($parts[1], "0");
+				$e -= strlen($d);
+				$m .= $d;
+			}
+		} else {
+			// explode from decimal
+			$parts = explode(".", $str);
+			$m = ltrim($parts[0], "0");
+			// if number had decimals
+			if (count($parts) == 2) {
+				// exponent is negative number of the decimals
+				$e = -strlen($parts[1]);
+				// append decimals to the mantissa
+				$m .= $parts[1];
+			} else {
+				$e = 0;
+			}
+			// shift trailing zeroes from the mantissa to the exponent
+			while (substr($m, -1) === "0") {
+				$e++;
+				$m = substr($m, 0, -1);
+			}
+		}
+		/* if exponent is zero, it must be prefixed with a "+" sign
          (X.690 07-2002, section 11.3.2.6) */
-        if (0 == $e) {
-            $es = "+";
-        } else {
-            $es = $e < 0 ? "-" : "";
-        }
-        return sprintf("%s.E%s%d", $m, $es, abs($e));
-    }
+		if (0 == $e) {
+			$es = "+";
+		} else {
+			$es = $e < 0 ? "-" : "";
+		}
+		return sprintf("%s.E%s%d", $m, $es, abs($e));
+	}
     
-    /**
-     * Convert NR3 form number to decimal.
-     *
-     * @param string $str
-     * @throws \UnexpectedValueException
-     * @return float
-     */
-    private static function _nr3ToDecimal($str)
-    {
-        if (!preg_match(self::NR3_REGEX, $str, $match)) {
-            throw new \UnexpectedValueException(
-                "'$str' is not a valid NR3 form real.");
-        }
-        $m = $match[2];
-        // if number started with minus sign
-        $inv = $match[1] == "-";
-        $e = intval($match[3]);
-        // positive exponent
-        if ($e > 0) {
-            // pad with trailing zeroes
-            $num = $m . str_repeat("0", $e);
-        } else if ($e < 0) {
-            // pad with leading zeroes
-            if (strlen($m) < abs($e)) {
-                $m = str_repeat("0", abs($e) - strlen($m)) . $m;
-            }
-            // insert decimal point
-            $num = substr($m, 0, $e) . "." . substr($m, $e);
-        } else {
-            $num = empty($m) ? "0" : $m;
-        }
-        // if number is negative
-        if ($inv) {
-            $num = "-$num";
-        }
-        return floatval($num);
-    }
+	/**
+	 * Convert NR3 form number to decimal.
+	 *
+	 * @param string $str
+	 * @throws \UnexpectedValueException
+	 * @return float
+	 */
+	private static function _nr3ToDecimal($str)
+	{
+		if (!preg_match(self::NR3_REGEX, $str, $match)) {
+			throw new \UnexpectedValueException(
+				"'$str' is not a valid NR3 form real.");
+		}
+		$m = $match[2];
+		// if number started with minus sign
+		$inv = $match[1] == "-";
+		$e = intval($match[3]);
+		// positive exponent
+		if ($e > 0) {
+			// pad with trailing zeroes
+			$num = $m . str_repeat("0", $e);
+		} else if ($e < 0) {
+			// pad with leading zeroes
+			if (strlen($m) < abs($e)) {
+				$m = str_repeat("0", abs($e) - strlen($m)) . $m;
+			}
+			// insert decimal point
+			$num = substr($m, 0, $e) . "." . substr($m, $e);
+		} else {
+			$num = empty($m) ? "0" : $m;
+		}
+		// if number is negative
+		if ($inv) {
+			$num = "-$num";
+		}
+		return floatval($num);
+	}
     
-    /**
-     * Test that number is valid for this context.
-     *
-     * @param mixed $num
-     * @return boolean
-     */
-    private static function _validateNumber($num)
-    {
-        if (!preg_match(self::NR3_REGEX, $num)) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Test that number is valid for this context.
+	 *
+	 * @param mixed $num
+	 * @return boolean
+	 */
+	private static function _validateNumber($num)
+	{
+		if (!preg_match(self::NR3_REGEX, $num)) {
+			return false;
+		}
+		return true;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -30,14 +30,14 @@
      * @link http://php.net/manual/en/language.types.float.php
      * @var string
      */
-    const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */
-        '([+\-]?'. // sign
-        '(?:'.
-            '\d+'. // LNUM
-            '|'.
-            '(?:\d*\.\d+|\d+\.\d*)'. // DNUM
-        '))[eE]'.
-        '([+\-]?\d+)'. // exponent
+    const PHP_EXPONENT_DNUM = '/^' . /* @formatter:off */
+        '([+\-]?' . // sign
+        '(?:' .
+            '\d+' . // LNUM
+            '|' .
+            '(?:\d*\.\d+|\d+\.\d*)' . // DNUM
+        '))[eE]' .
+        '([+\-]?\d+)' . // exponent
     '$/'; /* @formatter:on */
     
     /**

lib/ASN1/Component/Length.php

Indentation +178 added lines, -178 removed lines

@@ -10,190 +10,190 @@
  */
 class Length implements Encodable
 {
-    /**
-     * Length.
-     *
-     * @var int|string
-     */
-    private $_length;
+	/**
+	 * Length.
+	 *
+	 * @var int|string
+	 */
+	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, $indefinite = false)
-    {
-        $this->_length = $length;
-        $this->_indefinite = $indefinite;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $length Length
+	 * @param boolean $indefinite Whether length is indefinite
+	 */
+	public function __construct($length, $indefinite = false)
+	{
+		$this->_length = $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($data, &$offset = null)
-    {
-        assert('is_string($data)', "got " . gettype($data));
-        $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($data, &$offset = null)
+	{
+		assert('is_string($data)', "got " . gettype($data));
+		$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 int|string
-     */
-    private static function _decodeLongFormLength($length, $data, &$offset)
-    {
-        // 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 int|string
+	 */
+	private static function _decodeLongFormLength($length, $data, &$offset)
+	{
+		// 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($data, &$offset, $expected = null)
-    {
-        $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->_length) {
-            throw new DecodeException(
-                sprintf("Expected length %d, got %d.", $expected,
-                    $length->_length));
-        }
-        // check that enough data is available
-        if (strlen($data) < $idx + $length->_length) {
-            throw new DecodeException(
-                sprintf("Length %d overflows data, %d bytes left.",
-                    $length->_length, 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($data, &$offset, $expected = null)
+	{
+		$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->_length) {
+			throw new DecodeException(
+				sprintf("Expected length %d, got %d.", $expected,
+					$length->_length));
+		}
+		// check that enough data is available
+		if (strlen($data) < $idx + $length->_length) {
+			throw new DecodeException(
+				sprintf("Length %d overflows data, %d bytes left.",
+					$length->_length, strlen($data) - $idx));
+		}
+		$offset = $idx;
+		return $length;
+	}
     
-    /**
-     *
-     * @see Encodable::toDER()
-     * @throws \DomainException If length is too large to encode
-     * @return string
-     */
-    public function toDER()
-    {
-        $bytes = array();
-        if ($this->_indefinite) {
-            $bytes[] = 0x80;
-        } else {
-            $num = gmp_init($this->_length, 10);
-            // long form
-            if ($num > 127) {
-                $octets = array();
-                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()
+	{
+		$bytes = array();
+		if ($this->_indefinite) {
+			$bytes[] = 0x80;
+		} else {
+			$num = gmp_init($this->_length, 10);
+			// long form
+			if ($num > 127) {
+				$octets = array();
+				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 int|string
-     */
-    public function length()
-    {
-        if ($this->_indefinite) {
-            throw new \LogicException("Length is indefinite.");
-        }
-        return $this->_length;
-    }
+	/**
+	 * Get the length.
+	 *
+	 * @throws \LogicException If length is indefinite
+	 * @return int|string
+	 */
+	public function length()
+	{
+		if ($this->_indefinite) {
+			throw new \LogicException("Length is indefinite.");
+		}
+		return $this->_length;
+	}
     
-    /**
-     * Whether length is indefinite.
-     *
-     * @return boolean
-     */
-    public function isIndefinite()
-    {
-        return $this->_indefinite;
-    }
+	/**
+	 * Whether length is indefinite.
+	 *
+	 * @return boolean
+	 */
+	public function isIndefinite()
+	{
+		return $this->_indefinite;
+	}
 }

lib/ASN1/Component/Identifier.php

Indentation +262 added lines, -262 removed lines

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

lib/ASN1/Feature/ElementBase.php

Indentation +68 added lines, -68 removed lines

@@ -7,79 +7,79 @@
  */
 interface ElementBase extends Encodable
 {
-    /**
-     * Get the class of the ASN.1 type.
-     *
-     * One of <code>Identifier::CLASS_*</code> constants.
-     *
-     * @return int
-     */
-    public function typeClass();
+	/**
+	 * Get the class of the ASN.1 type.
+	 *
+	 * One of <code>Identifier::CLASS_*</code> constants.
+	 *
+	 * @return int
+	 */
+	public function typeClass();
     
-    /**
-     * Check whether the element is constructed.
-     *
-     * Otherwise it's primitive.
-     *
-     * @return bool
-     */
-    public function isConstructed();
+	/**
+	 * Check whether the element is constructed.
+	 *
+	 * Otherwise it's primitive.
+	 *
+	 * @return bool
+	 */
+	public function isConstructed();
     
-    /**
-     * Get the tag of the element.
-     *
-     * Interpretation of the tag depends on the context. For example it may
-     * represent a universal type tag or a tag of an implicitly or explicitly
-     * tagged type.
-     *
-     * @return int
-     */
-    public function tag();
+	/**
+	 * Get the tag of the element.
+	 *
+	 * Interpretation of the tag depends on the context. For example it may
+	 * represent a universal type tag or a tag of an implicitly or explicitly
+	 * tagged type.
+	 *
+	 * @return int
+	 */
+	public function tag();
     
-    /**
-     * Check whether the element is a type of a given tag.
-     *
-     * @param int $tag Type tag
-     * @return boolean
-     */
-    public function isType($tag);
+	/**
+	 * Check whether the element is a type of a given tag.
+	 *
+	 * @param int $tag Type tag
+	 * @return boolean
+	 */
+	public function isType($tag);
     
-    /**
-     * Check whether the element is a type of a given tag.
-     *
-     * Throws an exception if expectation fails.
-     *
-     * @param int $tag Type tag
-     * @throws \UnexpectedValueException If the element type differs from the
-     *         expected
-     * @return ElementBase
-     */
-    public function expectType($tag);
+	/**
+	 * Check whether the element is a type of a given tag.
+	 *
+	 * Throws an exception if expectation fails.
+	 *
+	 * @param int $tag Type tag
+	 * @throws \UnexpectedValueException If the element type differs from the
+	 *         expected
+	 * @return ElementBase
+	 */
+	public function expectType($tag);
     
-    /**
-     * Check whether the element is tagged (context specific).
-     *
-     * @return bool
-     */
-    public function isTagged();
+	/**
+	 * Check whether the element is tagged (context specific).
+	 *
+	 * @return bool
+	 */
+	public function isTagged();
     
-    /**
-     * Check whether the element is tagged (context specific) and optionally has
-     * a given tag.
-     *
-     * Throws an exception if the element is not tagged or tag differs from
-     * the expected.
-     *
-     * @param int|null $tag Optional type tag
-     * @throws \UnexpectedValueException If expectation fails
-     * @return \ASN1\Type\TaggedType
-     */
-    public function expectTagged($tag = null);
+	/**
+	 * Check whether the element is tagged (context specific) and optionally has
+	 * a given tag.
+	 *
+	 * Throws an exception if the element is not tagged or tag differs from
+	 * the expected.
+	 *
+	 * @param int|null $tag Optional type tag
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return \ASN1\Type\TaggedType
+	 */
+	public function expectTagged($tag = null);
     
-    /**
-     * Get the object as an abstract Element instance.
-     *
-     * @return \ASN1\Element
-     */
-    public function asElement();
+	/**
+	 * Get the object as an abstract Element instance.
+	 *
+	 * @return \ASN1\Element
+	 */
+	public function asElement();
 }

lib/ASN1/Feature/Encodable.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
  */
 interface Encodable
 {
-    /**
-     * Encode object to DER.
-     *
-     * @return string
-     */
-    public function toDER();
+	/**
+	 * Encode object to DER.
+	 *
+	 * @return string
+	 */
+	public function toDER();
 }

lib/ASN1/Util/Flags.php

Indentation +119 added lines, -119 removed lines

@@ -9,130 +9,130 @@
  */
 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 number $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, $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 number $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, $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, $width)
-    {
-        $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, $width)
+	{
+		$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($idx)
-    {
-        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($idx)
+	{
+		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()
-    {
-        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()
+	{
+		return $this->_flags;
+	}
     
-    /**
-     * Get flags as a base 10 integer.
-     *
-     * @return int|string
-     */
-    public function number()
-    {
-        $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 int|string
+	 */
+	public function number()
+	{
+		$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 BitString.
-     * Unused bits are set accordingly. Trailing zeroes are not stripped.
-     *
-     * @return BitString
-     */
-    public function 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()
+	{
+		$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/Type/PrimitiveString.php

Indentation +34 added lines, -34 removed lines

@@ -11,40 +11,40 @@
  */
 abstract class PrimitiveString extends StringType
 {
-    use PrimitiveType;
+	use PrimitiveType;
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER()
-    {
-        return $this->_string;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER()
+	{
+		return $this->_string;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_decodeFromDER()
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, $data,
-        &$offset)
-    {
-        $idx = $offset;
-        if (!$identifier->isPrimitive()) {
-            throw new DecodeException("DER encoded string must be primitive.");
-        }
-        $length = Length::expectFromDER($data, $idx);
-        $str = $length->length() ? substr($data, $idx, $length->length()) : "";
-        // substr should never return false, since length is
-        // checked by Length::expectFromDER.
-        assert('is_string($str)', "substr");
-        $offset = $idx + $length->length();
-        try {
-            return new static($str);
-        } catch (\InvalidArgumentException $e) {
-            throw new DecodeException($e->getMessage(), null, $e);
-        }
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_decodeFromDER()
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, $data,
+		&$offset)
+	{
+		$idx = $offset;
+		if (!$identifier->isPrimitive()) {
+			throw new DecodeException("DER encoded string must be primitive.");
+		}
+		$length = Length::expectFromDER($data, $idx);
+		$str = $length->length() ? substr($data, $idx, $length->length()) : "";
+		// substr should never return false, since length is
+		// checked by Length::expectFromDER.
+		assert('is_string($str)', "substr");
+		$offset = $idx + $length->length();
+		try {
+			return new static($str);
+		} catch (\InvalidArgumentException $e) {
+			throw new DecodeException($e->getMessage(), null, $e);
+		}
+	}
 }

lib/ASN1/Type/Primitive/Integer.php

Indentation +139 added lines, -139 removed lines

@@ -13,151 +13,151 @@
  */
 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()
-    {
-        $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()
+	{
+		$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($num)
-    {
-        $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($num)
+	{
+		$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($num)
-    {
-        $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($num)
+	{
+		$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, $data,
-        &$offset)
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        $bytes = substr($data, $idx, $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));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, $data,
+		&$offset)
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		$bytes = substr($data, $idx, $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)
-    {
-        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)
+	{
+		if (is_int($num)) {
+			return true;
+		}
+		if (is_string($num) && preg_match('/-?\d+/', $num)) {
+			return true;
+		}
+		return false;
+	}
 }

Switch Indentation +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
         $num = gmp_init($this->_number, 10);
         switch (gmp_sign($num)) {
             // positive
-            case 1:
-                return self::_encodePositiveInteger($num);
-            // negative
-            case -1:
-                return self::_encodeNegativeInteger($num);
+        case 1:
+            return self::_encodePositiveInteger($num);
+        // negative
+        case -1:
+            return self::_encodeNegativeInteger($num);
         }
         // zero
         return "\0";

lib/ASN1/Type/Primitive/UTF8String.php

Indentation +19 added lines, -19 removed lines

@@ -12,25 +12,25 @@
  */
 class UTF8String extends PrimitiveString
 {
-    use UniversalClass;
+	use UniversalClass;
     
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     */
-    public function __construct($string)
-    {
-        $this->_typeTag = self::TYPE_UTF8_STRING;
-        parent::__construct($string);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 */
+	public function __construct($string)
+	{
+		$this->_typeTag = self::TYPE_UTF8_STRING;
+		parent::__construct($string);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _validateString($string)
-    {
-        return mb_check_encoding($string, "UTF-8");
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _validateString($string)
+	{
+		return mb_check_encoding($string, "UTF-8");
+	}
 }