sop / x501

lib/X501/MatchingRule/BinaryMatch.php

Indentation +8 added lines, -8 removed lines

@@ -9,12 +9,12 @@
  */
 class BinaryMatch extends MatchingRule
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function compare($assertion, $value)
-    {
-        return strcmp($assertion, $value) == 0;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value)
+	{
+		return strcmp($assertion, $value) == 0;
+	}
 }

lib/X501/MatchingRule/MatchingRule.php

Indentation +9 added lines, -9 removed lines

@@ -9,13 +9,13 @@
  */
 abstract class MatchingRule
 {
-    /**
-     * Compare attribute value to assertion.
-     *
-     * @param mixed $assertion Value to assert
-     * @param mixed $value Attribute value
-     * @return bool|null True if value matches. Null shall be returned if match
-     *         evaluates to Undefined.
-     */
-    abstract public function compare($assertion, $value);
+	/**
+	 * Compare attribute value to assertion.
+	 *
+	 * @param mixed $assertion Value to assert
+	 * @param mixed $value Attribute value
+	 * @return bool|null True if value matches. Null shall be returned if match
+	 *         evaluates to Undefined.
+	 */
+	abstract public function compare($assertion, $value);
 }

lib/X501/MatchingRule/StringPrepMatchingRule.php

Indentation +25 added lines, -25 removed lines

@@ -9,31 +9,31 @@
  */
 abstract class StringPrepMatchingRule extends MatchingRule
 {
-    /**
-     * String preparer.
-     *
-     * @var StringPreparer $_prep
-     */
-    protected $_prep;
+	/**
+	 * String preparer.
+	 *
+	 * @var StringPreparer $_prep
+	 */
+	protected $_prep;
     
-    /**
-     * Constructor.
-     *
-     * @param StringPreparer $preparer
-     */
-    public function __construct(StringPreparer $preparer)
-    {
-        $this->_prep = $preparer;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param StringPreparer $preparer
+	 */
+	public function __construct(StringPreparer $preparer)
+	{
+		$this->_prep = $preparer;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function compare($assertion, $value)
-    {
-        $assertion = $this->_prep->prepare($assertion);
-        $value = $this->_prep->prepare($value);
-        return strcmp($assertion, $value) == 0;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value)
+	{
+		$assertion = $this->_prep->prepare($assertion);
+		$value = $this->_prep->prepare($value);
+		return strcmp($assertion, $value) == 0;
+	}
 }

lib/X501/MatchingRule/CaseIgnoreMatch.php

Indentation +10 added lines, -10 removed lines

@@ -13,14 +13,14 @@
  */
 class CaseIgnoreMatch extends StringPrepMatchingRule
 {
-    /**
-     * Constructor.
-     *
-     * @param int $string_type ASN.1 string type tag
-     */
-    public function __construct(int $string_type)
-    {
-        parent::__construct(
-            StringPreparer::forStringType($string_type)->withCaseFolding(true));
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $string_type ASN.1 string type tag
+	 */
+	public function __construct(int $string_type)
+	{
+		parent::__construct(
+			StringPreparer::forStringType($string_type)->withCaseFolding(true));
+	}
 }

lib/X501/MatchingRule/CaseExactMatch.php

Indentation +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@
  */
 class CaseExactMatch extends StringPrepMatchingRule
 {
-    /**
-     * Constructor.
-     *
-     * @param int $string_type ASN.1 string type tag
-     */
-    public function __construct(int $string_type)
-    {
-        parent::__construct(StringPreparer::forStringType($string_type));
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $string_type ASN.1 string type tag
+	 */
+	public function __construct(int $string_type)
+	{
+		parent::__construct(StringPreparer::forStringType($string_type));
+	}
 }

lib/X501/DN/DNParser.php

Indentation +369 added lines, -369 removed lines

@@ -15,390 +15,390 @@
  */
 class DNParser
 {
-    /**
-     * DN string.
-     *
-     * @var string
-     */
-    private $_dn;
+	/**
+	 * DN string.
+	 *
+	 * @var string
+	 */
+	private $_dn;
     
-    /**
-     * DN string length.
-     *
-     * @var int
-     */
-    private $_len;
+	/**
+	 * DN string length.
+	 *
+	 * @var int
+	 */
+	private $_len;
     
-    /**
-     * RFC 2253 special characters.
-     *
-     * @var string
-     */
-    const SPECIAL_CHARS = ",=+<>#;";
+	/**
+	 * RFC 2253 special characters.
+	 *
+	 * @var string
+	 */
+	const SPECIAL_CHARS = ",=+<>#;";
     
-    /**
-     * Parse distinguished name string to name-components.
-     *
-     * @param string $dn
-     * @return array
-     */
-    public static function parseString(string $dn): array
-    {
-        $parser = new self($dn);
-        return $parser->parse();
-    }
+	/**
+	 * Parse distinguished name string to name-components.
+	 *
+	 * @param string $dn
+	 * @return array
+	 */
+	public static function parseString(string $dn): array
+	{
+		$parser = new self($dn);
+		return $parser->parse();
+	}
     
-    /**
-     * Escape a AttributeValue string conforming to RFC 2253.
-     *
-     * @link https://tools.ietf.org/html/rfc2253#section-2.4
-     * @param string $str
-     * @return string
-     */
-    public static function escapeString(string $str): string
-    {
-        // one of the characters ",", "+", """, "\", "<", ">" or ";"
-        $str = preg_replace('/([,\+"\\\<\>;])/u', '\\\\$1', $str);
-        // a space character occurring at the end of the string
-        $str = preg_replace('/( )$/u', '\\\\$1', $str);
-        // a space or "#" character occurring at the beginning of the string
-        $str = preg_replace('/^([ #])/u', '\\\\$1', $str);
-        // implementation specific special characters
-        $str = preg_replace_callback('/([\pC])/u',
-            function ($m) {
-                $octets = str_split(bin2hex($m[1]), 2);
-                return implode("",
-                    array_map(
-                        function ($octet) {
-                            return '\\' . strtoupper($octet);
-                        }, $octets));
-            }, $str);
-        return $str;
-    }
+	/**
+	 * Escape a AttributeValue string conforming to RFC 2253.
+	 *
+	 * @link https://tools.ietf.org/html/rfc2253#section-2.4
+	 * @param string $str
+	 * @return string
+	 */
+	public static function escapeString(string $str): string
+	{
+		// one of the characters ",", "+", """, "\", "<", ">" or ";"
+		$str = preg_replace('/([,\+"\\\<\>;])/u', '\\\\$1', $str);
+		// a space character occurring at the end of the string
+		$str = preg_replace('/( )$/u', '\\\\$1', $str);
+		// a space or "#" character occurring at the beginning of the string
+		$str = preg_replace('/^([ #])/u', '\\\\$1', $str);
+		// implementation specific special characters
+		$str = preg_replace_callback('/([\pC])/u',
+			function ($m) {
+				$octets = str_split(bin2hex($m[1]), 2);
+				return implode("",
+					array_map(
+						function ($octet) {
+							return '\\' . strtoupper($octet);
+						}, $octets));
+			}, $str);
+		return $str;
+	}
     
-    /**
-     * Constructor.
-     *
-     * @param string $dn Distinguised name
-     */
-    protected function __construct(string $dn)
-    {
-        $this->_dn = $dn;
-        $this->_len = strlen($dn);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $dn Distinguised name
+	 */
+	protected function __construct(string $dn)
+	{
+		$this->_dn = $dn;
+		$this->_len = strlen($dn);
+	}
     
-    /**
-     * Parse DN to name-components.
-     *
-     * @throws \RuntimeException
-     * @return array
-     */
-    protected function parse(): array
-    {
-        $offset = 0;
-        $name = $this->_parseName($offset);
-        if ($offset < $this->_len) {
-            $remains = substr($this->_dn, $offset);
-            throw new \UnexpectedValueException(
-                "Parser finished before the end of string" .
-                     ", remaining: '$remains'.");
-        }
-        return $name;
-    }
+	/**
+	 * Parse DN to name-components.
+	 *
+	 * @throws \RuntimeException
+	 * @return array
+	 */
+	protected function parse(): array
+	{
+		$offset = 0;
+		$name = $this->_parseName($offset);
+		if ($offset < $this->_len) {
+			$remains = substr($this->_dn, $offset);
+			throw new \UnexpectedValueException(
+				"Parser finished before the end of string" .
+					 ", remaining: '$remains'.");
+		}
+		return $name;
+	}
     
-    /**
-     * Parse 'name'.
-     *
-     * name-component *("," name-component)
-     *
-     * @param int $offset
-     * @return array Array of name-components
-     */
-    private function _parseName(int &$offset): array
-    {
-        $idx = $offset;
-        $names = array();
-        while ($idx < $this->_len) {
-            $names[] = $this->_parseNameComponent($idx);
-            if ($idx >= $this->_len) {
-                break;
-            }
-            $this->_skipWs($idx);
-            if ("," != $this->_dn[$idx] && ";" != $this->_dn[$idx]) {
-                break;
-            }
-            $idx++;
-            $this->_skipWs($idx);
-        }
-        $offset = $idx;
-        return array_reverse($names);
-    }
+	/**
+	 * Parse 'name'.
+	 *
+	 * name-component *("," name-component)
+	 *
+	 * @param int $offset
+	 * @return array Array of name-components
+	 */
+	private function _parseName(int &$offset): array
+	{
+		$idx = $offset;
+		$names = array();
+		while ($idx < $this->_len) {
+			$names[] = $this->_parseNameComponent($idx);
+			if ($idx >= $this->_len) {
+				break;
+			}
+			$this->_skipWs($idx);
+			if ("," != $this->_dn[$idx] && ";" != $this->_dn[$idx]) {
+				break;
+			}
+			$idx++;
+			$this->_skipWs($idx);
+		}
+		$offset = $idx;
+		return array_reverse($names);
+	}
     
-    /**
-     * Parse 'name-component'.
-     *
-     * attributeTypeAndValue *("+" attributeTypeAndValue)
-     *
-     * @param int $offset
-     * @return array Array of [type, value] tuples
-     */
-    private function _parseNameComponent(int &$offset): array
-    {
-        $idx = $offset;
-        $tvpairs = array();
-        while ($idx < $this->_len) {
-            $tvpairs[] = $this->_parseAttrTypeAndValue($idx);
-            $this->_skipWs($idx);
-            if ($idx >= $this->_len || "+" != $this->_dn[$idx]) {
-                break;
-            }
-            ++$idx;
-            $this->_skipWs($idx);
-        }
-        $offset = $idx;
-        return $tvpairs;
-    }
+	/**
+	 * Parse 'name-component'.
+	 *
+	 * attributeTypeAndValue *("+" attributeTypeAndValue)
+	 *
+	 * @param int $offset
+	 * @return array Array of [type, value] tuples
+	 */
+	private function _parseNameComponent(int &$offset): array
+	{
+		$idx = $offset;
+		$tvpairs = array();
+		while ($idx < $this->_len) {
+			$tvpairs[] = $this->_parseAttrTypeAndValue($idx);
+			$this->_skipWs($idx);
+			if ($idx >= $this->_len || "+" != $this->_dn[$idx]) {
+				break;
+			}
+			++$idx;
+			$this->_skipWs($idx);
+		}
+		$offset = $idx;
+		return $tvpairs;
+	}
     
-    /**
-     * Parse 'attributeTypeAndValue'.
-     *
-     * attributeType "=" attributeValue
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return array A tuple of [type, value]. Value may be either a string or
-     *         an Element, if it's encoded as hexstring.
-     */
-    private function _parseAttrTypeAndValue(int &$offset): array
-    {
-        $idx = $offset;
-        $type = $this->_parseAttrType($idx);
-        $this->_skipWs($idx);
-        if ($idx >= $this->_len || "=" != $this->_dn[$idx++]) {
-            throw new \UnexpectedValueException("Invalid type and value pair.");
-        }
-        $this->_skipWs($idx);
-        // hexstring
-        if ($idx < $this->_len && "#" == $this->_dn[$idx]) {
-            ++$idx;
-            $data = $this->_parseAttrHexValue($idx);
-            try {
-                $value = Element::fromDER($data);
-            } catch (DecodeException $e) {
-                throw new \UnexpectedValueException(
-                    "Invalid DER encoding from hexstring.", 0, $e);
-            }
-        } else {
-            $value = $this->_parseAttrStringValue($idx);
-        }
-        $offset = $idx;
-        return array($type, $value);
-    }
+	/**
+	 * Parse 'attributeTypeAndValue'.
+	 *
+	 * attributeType "=" attributeValue
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return array A tuple of [type, value]. Value may be either a string or
+	 *         an Element, if it's encoded as hexstring.
+	 */
+	private function _parseAttrTypeAndValue(int &$offset): array
+	{
+		$idx = $offset;
+		$type = $this->_parseAttrType($idx);
+		$this->_skipWs($idx);
+		if ($idx >= $this->_len || "=" != $this->_dn[$idx++]) {
+			throw new \UnexpectedValueException("Invalid type and value pair.");
+		}
+		$this->_skipWs($idx);
+		// hexstring
+		if ($idx < $this->_len && "#" == $this->_dn[$idx]) {
+			++$idx;
+			$data = $this->_parseAttrHexValue($idx);
+			try {
+				$value = Element::fromDER($data);
+			} catch (DecodeException $e) {
+				throw new \UnexpectedValueException(
+					"Invalid DER encoding from hexstring.", 0, $e);
+			}
+		} else {
+			$value = $this->_parseAttrStringValue($idx);
+		}
+		$offset = $idx;
+		return array($type, $value);
+	}
     
-    /**
-     * Parse 'attributeType'.
-     *
-     * (ALPHA 1*keychar) / oid
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrType(int &$offset): string
-    {
-        $idx = $offset;
-        // dotted OID
-        $type = $this->_regexMatch('/^(?:oid\.)?([0-9]+(?:\.[0-9]+)*)/i', $idx);
-        if (null === $type) {
-            // name
-            $type = $this->_regexMatch('/^[a-z][a-z0-9\-]*/i', $idx);
-            if (null === $type) {
-                throw new \UnexpectedValueException("Invalid attribute type.");
-            }
-        }
-        $offset = $idx;
-        return $type;
-    }
+	/**
+	 * Parse 'attributeType'.
+	 *
+	 * (ALPHA 1*keychar) / oid
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrType(int &$offset): string
+	{
+		$idx = $offset;
+		// dotted OID
+		$type = $this->_regexMatch('/^(?:oid\.)?([0-9]+(?:\.[0-9]+)*)/i', $idx);
+		if (null === $type) {
+			// name
+			$type = $this->_regexMatch('/^[a-z][a-z0-9\-]*/i', $idx);
+			if (null === $type) {
+				throw new \UnexpectedValueException("Invalid attribute type.");
+			}
+		}
+		$offset = $idx;
+		return $type;
+	}
     
-    /**
-     * Parse 'attributeValue' of string type.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrStringValue(int &$offset): string
-    {
-        $idx = $offset;
-        if ($idx >= $this->_len) {
-            return "";
-        }
-        if ('"' == $this->_dn[$idx]) { // quoted string
-            $val = $this->_parseQuotedAttrString($idx);
-        } else { // string
-            $val = $this->_parseAttrString($idx);
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse 'attributeValue' of string type.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrStringValue(int &$offset): string
+	{
+		$idx = $offset;
+		if ($idx >= $this->_len) {
+			return "";
+		}
+		if ('"' == $this->_dn[$idx]) { // quoted string
+			$val = $this->_parseQuotedAttrString($idx);
+		} else { // string
+			$val = $this->_parseAttrString($idx);
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Parse plain 'attributeValue' string.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrString(int &$offset): string
-    {
-        $idx = $offset;
-        $val = "";
-        $wsidx = null;
-        while ($idx < $this->_len) {
-            $c = $this->_dn[$idx];
-            // pair (escape sequence)
-            if ("\\" == $c) {
-                ++$idx;
-                $val .= $this->_parsePairAfterSlash($idx);
-                $wsidx = null;
-                continue;
-            } else if ('"' == $c) {
-                throw new \UnexpectedValueException("Unexpected quotation.");
-            } else if (false !== strpos(self::SPECIAL_CHARS, $c)) {
-                break;
-            }
-            // keep track of the first consecutive whitespace
-            if (' ' == $c) {
-                if (null === $wsidx) {
-                    $wsidx = $idx;
-                }
-            } else {
-                $wsidx = null;
-            }
-            // stringchar
-            $val .= $c;
-            ++$idx;
-        }
-        // if there was non-escaped whitespace in the end of the value
-        if (null !== $wsidx) {
-            $val = substr($val, 0, -($idx - $wsidx));
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse plain 'attributeValue' string.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrString(int &$offset): string
+	{
+		$idx = $offset;
+		$val = "";
+		$wsidx = null;
+		while ($idx < $this->_len) {
+			$c = $this->_dn[$idx];
+			// pair (escape sequence)
+			if ("\\" == $c) {
+				++$idx;
+				$val .= $this->_parsePairAfterSlash($idx);
+				$wsidx = null;
+				continue;
+			} else if ('"' == $c) {
+				throw new \UnexpectedValueException("Unexpected quotation.");
+			} else if (false !== strpos(self::SPECIAL_CHARS, $c)) {
+				break;
+			}
+			// keep track of the first consecutive whitespace
+			if (' ' == $c) {
+				if (null === $wsidx) {
+					$wsidx = $idx;
+				}
+			} else {
+				$wsidx = null;
+			}
+			// stringchar
+			$val .= $c;
+			++$idx;
+		}
+		// if there was non-escaped whitespace in the end of the value
+		if (null !== $wsidx) {
+			$val = substr($val, 0, -($idx - $wsidx));
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Parse quoted 'attributeValue' string.
-     *
-     * @param int $offset Offset to starting quote
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseQuotedAttrString(int &$offset): string
-    {
-        $idx = $offset + 1;
-        $val = "";
-        while ($idx < $this->_len) {
-            $c = $this->_dn[$idx];
-            if ("\\" == $c) { // pair
-                ++$idx;
-                $val .= $this->_parsePairAfterSlash($idx);
-                continue;
-            } else if ('"' == $c) {
-                ++$idx;
-                break;
-            }
-            $val .= $c;
-            ++$idx;
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse quoted 'attributeValue' string.
+	 *
+	 * @param int $offset Offset to starting quote
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseQuotedAttrString(int &$offset): string
+	{
+		$idx = $offset + 1;
+		$val = "";
+		while ($idx < $this->_len) {
+			$c = $this->_dn[$idx];
+			if ("\\" == $c) { // pair
+				++$idx;
+				$val .= $this->_parsePairAfterSlash($idx);
+				continue;
+			} else if ('"' == $c) {
+				++$idx;
+				break;
+			}
+			$val .= $c;
+			++$idx;
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Parse 'attributeValue' of binary type.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrHexValue(int &$offset): string
-    {
-        $idx = $offset;
-        $hexstr = $this->_regexMatch('/^(?:[0-9a-f]{2})+/i', $idx);
-        if (null === $hexstr) {
-            throw new \UnexpectedValueException("Invalid hexstring.");
-        }
-        $data = hex2bin($hexstr);
-        $offset = $idx;
-        return $data;
-    }
+	/**
+	 * Parse 'attributeValue' of binary type.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrHexValue(int &$offset): string
+	{
+		$idx = $offset;
+		$hexstr = $this->_regexMatch('/^(?:[0-9a-f]{2})+/i', $idx);
+		if (null === $hexstr) {
+			throw new \UnexpectedValueException("Invalid hexstring.");
+		}
+		$data = hex2bin($hexstr);
+		$offset = $idx;
+		return $data;
+	}
     
-    /**
-     * Parse 'pair' after leading slash.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parsePairAfterSlash(int &$offset): string
-    {
-        $idx = $offset;
-        if ($idx >= $this->_len) {
-            throw new \UnexpectedValueException(
-                "Unexpected end of escape sequence.");
-        }
-        $c = $this->_dn[$idx++];
-        // special | \ | " | SPACE
-        if (false !== strpos(self::SPECIAL_CHARS . '\\" ', $c)) {
-            $val = $c;
-        } else { // hexpair
-            if ($idx >= $this->_len) {
-                throw new \UnexpectedValueException("Unexpected end of hexpair.");
-            }
-            $val = @hex2bin($c . $this->_dn[$idx++]);
-            if (false === $val) {
-                throw new \UnexpectedValueException("Invalid hexpair.");
-            }
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse 'pair' after leading slash.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parsePairAfterSlash(int &$offset): string
+	{
+		$idx = $offset;
+		if ($idx >= $this->_len) {
+			throw new \UnexpectedValueException(
+				"Unexpected end of escape sequence.");
+		}
+		$c = $this->_dn[$idx++];
+		// special | \ | " | SPACE
+		if (false !== strpos(self::SPECIAL_CHARS . '\\" ', $c)) {
+			$val = $c;
+		} else { // hexpair
+			if ($idx >= $this->_len) {
+				throw new \UnexpectedValueException("Unexpected end of hexpair.");
+			}
+			$val = @hex2bin($c . $this->_dn[$idx++]);
+			if (false === $val) {
+				throw new \UnexpectedValueException("Invalid hexpair.");
+			}
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Match DN to pattern and extract the last capture group.
-     *
-     * Updates offset to fully matched pattern.
-     *
-     * @param string $pattern
-     * @param int $offset
-     * @return string|null Null if pattern doesn't match
-     */
-    private function _regexMatch(string $pattern, int &$offset)
-    {
-        $idx = $offset;
-        if (!preg_match($pattern, substr($this->_dn, $idx), $match)) {
-            return null;
-        }
-        $idx += strlen($match[0]);
-        $offset = $idx;
-        return end($match);
-    }
+	/**
+	 * Match DN to pattern and extract the last capture group.
+	 *
+	 * Updates offset to fully matched pattern.
+	 *
+	 * @param string $pattern
+	 * @param int $offset
+	 * @return string|null Null if pattern doesn't match
+	 */
+	private function _regexMatch(string $pattern, int &$offset)
+	{
+		$idx = $offset;
+		if (!preg_match($pattern, substr($this->_dn, $idx), $match)) {
+			return null;
+		}
+		$idx += strlen($match[0]);
+		$offset = $idx;
+		return end($match);
+	}
     
-    /**
-     * Skip consecutive spaces.
-     *
-     * @param int $offset
-     */
-    private function _skipWs(int &$offset)
-    {
-        $idx = $offset;
-        while ($idx < $this->_len) {
-            if (" " != $this->_dn[$idx]) {
-                break;
-            }
-            ++$idx;
-        }
-        $offset = $idx;
-    }
+	/**
+	 * Skip consecutive spaces.
+	 *
+	 * @param int $offset
+	 */
+	private function _skipWs(int &$offset)
+	{
+		$idx = $offset;
+		while ($idx < $this->_len) {
+			if (" " != $this->_dn[$idx]) {
+				break;
+			}
+			++$idx;
+		}
+		$offset = $idx;
+	}
 }

lib/X501/StringPrep/StringPreparer.php

Indentation +68 added lines, -68 removed lines

@@ -11,77 +11,77 @@
  */
 class StringPreparer
 {
-    const STEP_TRANSCODE = 1;
-    const STEP_MAP = 2;
-    const STEP_NORMALIZE = 3;
-    const STEP_PROHIBIT = 4;
-    const STEP_CHECK_BIDI = 5;
-    const STEP_INSIGNIFICANT_CHARS = 6;
+	const STEP_TRANSCODE = 1;
+	const STEP_MAP = 2;
+	const STEP_NORMALIZE = 3;
+	const STEP_PROHIBIT = 4;
+	const STEP_CHECK_BIDI = 5;
+	const STEP_INSIGNIFICANT_CHARS = 6;
     
-    /**
-     * Preparation steps.
-     *
-     * @var PrepareStep[] $_steps
-     */
-    protected $_steps;
+	/**
+	 * Preparation steps.
+	 *
+	 * @var PrepareStep[] $_steps
+	 */
+	protected $_steps;
     
-    /**
-     * Constructor.
-     *
-     * @param PrepareStep[] $steps Preparation steps to apply
-     */
-    protected function __construct(array $steps)
-    {
-        $this->_steps = $steps;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param PrepareStep[] $steps Preparation steps to apply
+	 */
+	protected function __construct(array $steps)
+	{
+		$this->_steps = $steps;
+	}
     
-    /**
-     * Get default instance for given string type.
-     *
-     * @param int $string_type ASN.1 string type tag.
-     * @return self
-     */
-    public static function forStringType(int $string_type): self
-    {
-        $steps = array(
-            /* @formatter:off */
-            self::STEP_TRANSCODE => new TranscodeStep($string_type), 
-            self::STEP_MAP => new MapStep(), 
-            self::STEP_NORMALIZE => new NormalizeStep(), 
-            self::STEP_PROHIBIT => new ProhibitStep(), 
-            self::STEP_CHECK_BIDI => new CheckBidiStep(), 
-            // @todo Vary by string type
-            self::STEP_INSIGNIFICANT_CHARS => 
-                new InsignificantNonSubstringSpaceStep()
-            /* @formatter:on */
-        );
-        return new self($steps);
-    }
+	/**
+	 * Get default instance for given string type.
+	 *
+	 * @param int $string_type ASN.1 string type tag.
+	 * @return self
+	 */
+	public static function forStringType(int $string_type): self
+	{
+		$steps = array(
+			/* @formatter:off */
+			self::STEP_TRANSCODE => new TranscodeStep($string_type), 
+			self::STEP_MAP => new MapStep(), 
+			self::STEP_NORMALIZE => new NormalizeStep(), 
+			self::STEP_PROHIBIT => new ProhibitStep(), 
+			self::STEP_CHECK_BIDI => new CheckBidiStep(), 
+			// @todo Vary by string type
+			self::STEP_INSIGNIFICANT_CHARS => 
+				new InsignificantNonSubstringSpaceStep()
+			/* @formatter:on */
+		);
+		return new self($steps);
+	}
     
-    /**
-     * Get self with case folding set.
-     *
-     * @param bool $fold True to apply case folding
-     * @return self
-     */
-    public function withCaseFolding(bool $fold): self
-    {
-        $obj = clone $this;
-        $obj->_steps[self::STEP_MAP] = new MapStep($fold);
-        return $obj;
-    }
+	/**
+	 * Get self with case folding set.
+	 *
+	 * @param bool $fold True to apply case folding
+	 * @return self
+	 */
+	public function withCaseFolding(bool $fold): self
+	{
+		$obj = clone $this;
+		$obj->_steps[self::STEP_MAP] = new MapStep($fold);
+		return $obj;
+	}
     
-    /**
-     * Prepare string.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function prepare(string $string): string
-    {
-        foreach ($this->_steps as $step) {
-            $string = $step->apply($string);
-        }
-        return $string;
-    }
+	/**
+	 * Prepare string.
+	 *
+	 * @param string $string
+	 * @return string
+	 */
+	public function prepare(string $string): string
+	{
+		foreach ($this->_steps as $step) {
+			$string = $step->apply($string);
+		}
+		return $string;
+	}
 }

lib/X501/StringPrep/NormalizeStep.php

Indentation +9 added lines, -9 removed lines

@@ -12,13 +12,13 @@
  */
 class NormalizeStep implements PrepareStep
 {
-    /**
-     *
-     * @param string $string UTF-8 encoded string
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        return normalizer_normalize($string, \Normalizer::NFKC);
-    }
+	/**
+	 *
+	 * @param string $string UTF-8 encoded string
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		return normalizer_normalize($string, \Normalizer::NFKC);
+	}
 }

lib/X501/StringPrep/TranscodeStep.php

Indentation +45 added lines, -45 removed lines

@@ -15,51 +15,51 @@
  */
 class TranscodeStep implements PrepareStep
 {
-    /**
-     * ASN.1 type of the string.
-     *
-     * @var int $_type
-     */
-    protected $_type;
+	/**
+	 * ASN.1 type of the string.
+	 *
+	 * @var int $_type
+	 */
+	protected $_type;
     
-    /**
-     * Constructor.
-     *
-     * @param int $type ASN.1 type tag of the string
-     */
-    public function __construct(int $type)
-    {
-        $this->_type = $type;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $type ASN.1 type tag of the string
+	 */
+	public function __construct(int $type)
+	{
+		$this->_type = $type;
+	}
     
-    /**
-     *
-     * @throws \LogicException If string type is not supported
-     * @param string $string String to prepare
-     * @return string UTF-8 encoded string
-     */
-    public function apply(string $string): string
-    {
-        switch ($this->_type) {
-            // UTF-8 string as is
-            case Element::TYPE_UTF8_STRING:
-                return $string;
-            // PrintableString maps directly to UTF-8
-            case Element::TYPE_PRINTABLE_STRING:
-                return $string;
-            // UCS-2 to UTF-8
-            case Element::TYPE_BMP_STRING:
-                return mb_convert_encoding($string, "UTF-8", "UCS-2BE");
-            // UCS-4 to UTF-8
-            case Element::TYPE_UNIVERSAL_STRING:
-                return mb_convert_encoding($string, "UTF-8", "UCS-4BE");
-            // TeletexString mapping is a local matter.
-            // We take a shortcut here and encode it as a hexstring.
-            case Element::TYPE_T61_STRING:
-                $el = new T61String($string);
-                return "#" . bin2hex($el->toDER());
-        }
-        throw new \LogicException(
-            "Unsupported string type " . Element::tagToName($this->_type) . ".");
-    }
+	/**
+	 *
+	 * @throws \LogicException If string type is not supported
+	 * @param string $string String to prepare
+	 * @return string UTF-8 encoded string
+	 */
+	public function apply(string $string): string
+	{
+		switch ($this->_type) {
+			// UTF-8 string as is
+			case Element::TYPE_UTF8_STRING:
+				return $string;
+			// PrintableString maps directly to UTF-8
+			case Element::TYPE_PRINTABLE_STRING:
+				return $string;
+			// UCS-2 to UTF-8
+			case Element::TYPE_BMP_STRING:
+				return mb_convert_encoding($string, "UTF-8", "UCS-2BE");
+			// UCS-4 to UTF-8
+			case Element::TYPE_UNIVERSAL_STRING:
+				return mb_convert_encoding($string, "UTF-8", "UCS-4BE");
+			// TeletexString mapping is a local matter.
+			// We take a shortcut here and encode it as a hexstring.
+			case Element::TYPE_T61_STRING:
+				$el = new T61String($string);
+				return "#" . bin2hex($el->toDER());
+		}
+		throw new \LogicException(
+			"Unsupported string type " . Element::tagToName($this->_type) . ".");
+	}
 }